diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py index 536f0c39..ce3b9aa1 100755 --- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py +++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py @@ -239,7 +239,7 @@ parser.add_argument("-i", "--ignore", type=str, default='no', choices=['yes', 'n help="Set to 'no' to ignore current running version on AP and run sanity including upgrade") parser.add_argument("-r", "--report", type=str, default=report_path, help="Report directory path other than default - directory must already exist!") -parser.add_argument("-m", "--model", type=str, choices=['ea8300', 'ecw5410', 'ecw5211', 'ec420'], +parser.add_argument("-m", "--model", type=str, choices=['ea8300', 'ecw5410', 'ecw5211', 'ec420', "wf188n"], help="AP model to be run") parser.add_argument("--tr_prefix", type=str, default=testRunPrefix, help="Testrail test run prefix override (default is Env variable)") parser.add_argument("--skip_upgrade", dest="skip_upgrade", action='store_true', help="Skip Upgrade testing") @@ -393,7 +393,7 @@ for key in equipment_ids: fw_model = ap_cli_fw.partition("-")[0] print('Current Active AP FW from CLI:', ap_cli_fw) - print(fw_model) + ###Find Latest FW for Current AP Model and Get FW ID ##Compare Latest and Current AP FW and Upgrade @@ -440,7 +440,6 @@ for key in equipment_ids: if args.skip_bridge == True: for x in test_cases: if "bridge" in x: - print(x) case_ids.remove(test_cases[x]) else: pass @@ -1251,8 +1250,7 @@ for key in equipment_ids: if args.skip_eap != True: radiusProfileId = radius_profile child_profiles = [fiveG_eap, fiveG_wpa2, fiveG_wpa, twoFourG_eap, twoFourG_wpa2, twoFourG_wpa, - rfProfileId, - radiusProfileId] + rfProfileId] print(child_profiles) else: child_profiles = [fiveG_wpa2, fiveG_wpa, twoFourG_wpa2, twoFourG_wpa, rfProfileId] diff --git a/py-scripts/tip-cicd-sanity/lab_ap_info.py b/py-scripts/tip-cicd-sanity/lab_ap_info.py index bc2540ad..60679dc6 100755 --- a/py-scripts/tip-cicd-sanity/lab_ap_info.py +++ b/py-scripts/tip-cicd-sanity/lab_ap_info.py @@ -1,7 +1,7 @@ #!/usr/bin/python3 ##AP Models Under Test -ap_models = ["ec420","ea8300","ecw5211","ecw5410"] +ap_models = ["ec420","ea8300","ecw5211","ecw5410","wf188n"] ##Cloud Type(cloudSDK = v1, CMAP = cmap) cloud_type = "v1" @@ -30,28 +30,32 @@ cloud_sdk_models = { "ec420": "EC420-G1", "ea8300": "EA8300-CA", "ecw5211": "ECW5211", - "ecw5410": "ECW5410" + "ecw5410": "ECW5410", + "wf188n": "WF188N" } mimo_5g = { "ec420": "4x4", "ea8300": "2x2", "ecw5211": "2x2", - "ecw5410": "4x4" + "ecw5410": "4x4", + "wf188n": "2x2" } mimo_2dot4g = { "ec420": "2x2", "ea8300": "2x2", "ecw5211": "2x2", - "ecw5410": "4x4" + "ecw5410": "4x4", + "wf188n": "2x2" } sanity_status = { "ea8300": "failed", "ecw5211": 'passed', "ecw5410": 'failed', - "ec420": 'failed' + "ec420": 'failed', + "wf188n": "failed" } ##Customer ID for testing @@ -62,21 +66,24 @@ equipment_id_dict = { "ea8300": "115", "ecw5410": "116", "ecw5211": "117", - "ec420": "27" + "ec420": "27", + "wf188n": "127" } equipment_ip_dict = { "ea8300": "10.10.10.103", "ecw5410": "10.10.10.105", "ec420": "10.10.10.104", - "ecw5211": "10.10.10.102" + "ecw5211": "10.10.10.102", + "wf188n": "10.10.10.179" } eqiupment_credentials_dict = { "ea8300": "openwifi", "ecw5410": "openwifi", "ec420": "openwifi", - "ecw5211": "admin123" + "ecw5211": "admin123", + "wf188n": "openwifi" } ##Test Case information - Maps a generic TC name to TestRail TC numbers @@ -301,6 +308,45 @@ profile_info_dict = { ] }, + "wf188n": { + "profile_id": "3724", + "childProfileIds": [ + 3718, + 3719, + 3720, + 3721, + 3722, + 3723, + 10 + ], + "fiveG_WPA2_SSID": "WF188N_5G_WPA2", + "fiveG_WPA2_PSK": "Connectus123$", + "fiveG_WPA_SSID": "WF188N_5G_WPA", + "fiveG_WPA_PSK": "Connectus123$", + "fiveG_OPEN_SSID": "WF188N_5G_OPEN", + "fiveG_WPA2-EAP_SSID": "WF188N_5G_WPA2-EAP", + "twoFourG_OPEN_SSID": "WF188N_2dot4G_OPEN", + "twoFourG_WPA2_SSID": "WF188N_2dot4G_WPA2", + "twoFourG_WPA2_PSK": "Connectus123$", + "twoFourG_WPA_SSID": "WF188N_2dot4G_WPA", + "twoFourG_WPA_PSK": "Connectus123$", + "twoFourG_WPA2-EAP_SSID": "WF188N_2dot4G_WPA2-EAP", + "fiveG_WPA2_profile": 3719, + "fiveG_WPA_profile": 3720, + "fiveG_WPA2-EAP_profile": 3718, + "twoFourG_WPA2_profile": 3722, + "twoFourG_WPA_profile": 3723, + "twoFourG_WPA2-EAP_profile": 3721, + "ssid_list": [ + "WF188N_5G_WPA2", + "WF188N_5G_WPA", + "WF188N_5G_WPA2-EAP", + "WF188N_2dot4G_WPA2", + "WF188N_2dot4G_WPA", + "WF188N_2dot4G_WPA2-EAP" + ] + }, + "ecw5410_nat": { "profile_id": "68", "childProfileIds": [ @@ -461,6 +507,45 @@ profile_info_dict = { ] }, + "wf188n_nat": { + "profile_id": "3732", + "childProfileIds": [ + 3728, + 3729, + 3730, + 3731, + 10, + 3726, + 3727 + ], + "fiveG_WPA2_SSID": "WF188N_5G_WPA2_NAT", + "fiveG_WPA2_PSK": "Connectus123$", + "fiveG_WPA_SSID": "WF188N_5G_WPA_NAT", + "fiveG_WPA_PSK": "Connectus123$", + "fiveG_OPEN_SSID": "WF188N_5G_OPEN_NAT", + "fiveG_WPA2-EAP_SSID": "WF188N_5G_WPA2-EAP_NAT", + "twoFourG_OPEN_SSID": "WF188N_2dot4G_OPEN_NAT", + "twoFourG_WPA2_SSID": "WF188N_2dot4G_WPA2_NAT", + "twoFourG_WPA2_PSK": "Connectus123$", + "twoFourG_WPA_SSID": "WF188N_2dot4G_WPA_NAT", + "twoFourG_WPA_PSK": "Connectus123$", + "twoFourG_WPA2-EAP_SSID": "WF188N_2dot4G_WPA2-EAP_NAT", + "fiveG_WPA2_profile": 3727, + "fiveG_WPA_profile": 3728, + "fiveG_WPA2-EAP_profile": 3726, + "twoFourG_WPA2_profile": 3730, + "twoFourG_WPA_profile": 3731, + "twoFourG_WPA2-EAP_profile": 3729, + "ssid_list": [ + "WF188N_5G_WPA2_NAT", + "WF188N_5G_WPA_NAT", + "WF188N_5G_WPA2-EAP_NAT", + "WF188N_2dot4G_WPA2_NAT", + "WF188N_2dot4G_WPA_NAT", + "WF188N_2dot4G_WPA2-EAP_NAT" + ] + }, + "ecw5410_vlan": { "profile_id": "338", "childProfileIds": [ @@ -619,5 +704,44 @@ profile_info_dict = { "ECW5211_2dot4G_WPA_VLAN", "ECW5211_2dot4G_WPA2-EAP_VLAN" ] + }, + + "wf188n_vlan": { + "profile_id": "3740", + "childProfileIds": [ + 3734, + 3735, + 3736, + 3737, + 3738, + 10, + 3739 + ], + "fiveG_WPA2_SSID": "WF188N_5G_WPA2_VLAN", + "fiveG_WPA2_PSK": "Connectus123$", + "fiveG_WPA_SSID": "WF188N_5G_WPA_VLAN", + "fiveG_WPA_PSK": "Connectus123$", + "fiveG_OPEN_SSID": "WF188N_5G_OPEN_VLAN", + "fiveG_WPA2-EAP_SSID": "WF188N_5G_WPA2-EAP_VLAN", + "twoFourG_OPEN_SSID": "WF188N_2dot4G_OPEN_VLAN", + "twoFourG_WPA2_SSID": "WF188N_2dot4G_WPA2_VLAN", + "twoFourG_WPA2_PSK": "Connectus123$", + "twoFourG_WPA_SSID": "WF188N_2dot4G_WPA_VLAN", + "twoFourG_WPA_PSK": "Connectus123$", + "twoFourG_WPA2-EAP_SSID": "WF188N_2dot4G_WPA2-EAP_VLAN", + "fiveG_WPA2_profile": 3738, + "fiveG_WPA_profile": 3739, + "fiveG_WPA2-EAP_profile": 3737, + "twoFourG_WPA2_profile": 3722, + "twoFourG_WPA_profile": 3723, + "twoFourG_WPA2-EAP_profile": 3721, + "ssid_list": [ + "WF188N_5G_WPA2_VLAN", + "WF188N_5G_WPA_VLAN", + "WF188N_5G_WPA2-EAP_VLAN", + "WF188N_2dot4G_WPA2_VLAN", + "WF188N_2dot4G_WPA_VLAN", + "WF188N_2dot4G_WPA2-EAP_VLAN" + ] } } diff --git a/py-scripts/tip-cicd-sanity/reports/report_template.php b/py-scripts/tip-cicd-sanity/reports/report_template.php index f25fcda5..d60f2c83 100755 --- a/py-scripts/tip-cicd-sanity/reports/report_template.php +++ b/py-scripts/tip-cicd-sanity/reports/report_template.php @@ -46,7 +46,7 @@ $json = json_decode($results, true); - @@ -56,6 +56,7 @@ $json = json_decode($results, true); + @@ -64,6 +65,7 @@ $json = json_decode($results, true); + @@ -72,6 +74,7 @@ $json = json_decode($results, true); + @@ -80,6 +83,7 @@ $json = json_decode($results, true); + @@ -88,6 +92,7 @@ $json = json_decode($results, true); + @@ -96,6 +101,7 @@ $json = json_decode($results, true); + @@ -104,16 +110,18 @@ $json = json_decode($results, true); + - + + @@ -123,6 +131,7 @@ $json = json_decode($results, true); + @@ -133,6 +142,7 @@ $json = json_decode($results, true); + @@ -143,6 +153,7 @@ $json = json_decode($results, true); + @@ -153,6 +164,7 @@ $json = json_decode($results, true); + @@ -163,6 +175,7 @@ $json = json_decode($results, true); + @@ -173,6 +186,7 @@ $json = json_decode($results, true); + @@ -183,6 +197,7 @@ $json = json_decode($results, true); + @@ -193,6 +208,7 @@ $json = json_decode($results, true); + @@ -202,7 +218,8 @@ $json = json_decode($results, true); - + + @@ -212,7 +229,8 @@ $json = json_decode($results, true); - + + @@ -223,6 +241,7 @@ $json = json_decode($results, true); + @@ -233,6 +252,7 @@ $json = json_decode($results, true); + @@ -243,6 +263,7 @@ $json = json_decode($results, true); + @@ -253,6 +274,7 @@ $json = json_decode($results, true); + @@ -263,6 +285,7 @@ $json = json_decode($results, true); + @@ -273,6 +296,7 @@ $json = json_decode($results, true); + @@ -283,6 +307,7 @@ $json = json_decode($results, true); + @@ -292,6 +317,7 @@ $json = json_decode($results, true); + @@ -301,6 +327,7 @@ $json = json_decode($results, true); + @@ -310,6 +337,7 @@ $json = json_decode($results, true); + @@ -319,6 +347,7 @@ $json = json_decode($results, true); + @@ -327,7 +356,8 @@ $json = json_decode($results, true); - + + @@ -336,7 +366,8 @@ $json = json_decode($results, true); - + + @@ -347,6 +378,7 @@ $json = json_decode($results, true); + @@ -357,6 +389,7 @@ $json = json_decode($results, true); + @@ -367,6 +400,7 @@ $json = json_decode($results, true); + @@ -377,6 +411,7 @@ $json = json_decode($results, true); + @@ -387,6 +422,7 @@ $json = json_decode($results, true); + @@ -397,6 +433,7 @@ $json = json_decode($results, true); + @@ -407,6 +444,7 @@ $json = json_decode($results, true); + @@ -417,6 +455,7 @@ $json = json_decode($results, true); + @@ -426,6 +465,7 @@ $json = json_decode($results, true); + @@ -435,6 +475,7 @@ $json = json_decode($results, true); + @@ -444,6 +485,7 @@ $json = json_decode($results, true); + @@ -453,6 +495,7 @@ $json = json_decode($results, true); + @@ -462,6 +505,7 @@ $json = json_decode($results, true); + @@ -470,7 +514,8 @@ $json = json_decode($results, true); - + + @@ -481,6 +526,7 @@ $json = json_decode($results, true); + @@ -491,6 +537,7 @@ $json = json_decode($results, true); + @@ -501,6 +548,7 @@ $json = json_decode($results, true); + @@ -511,6 +559,7 @@ $json = json_decode($results, true); + @@ -521,6 +570,7 @@ $json = json_decode($results, true); + @@ -531,6 +581,7 @@ $json = json_decode($results, true); + @@ -541,6 +592,7 @@ $json = json_decode($results, true); + @@ -551,6 +603,7 @@ $json = json_decode($results, true); + @@ -561,6 +614,7 @@ $json = json_decode($results, true); + @@ -571,6 +625,7 @@ $json = json_decode($results, true); + @@ -580,6 +635,7 @@ $json = json_decode($results, true); + @@ -589,6 +645,7 @@ $json = json_decode($results, true); + @@ -598,6 +655,7 @@ $json = json_decode($results, true); + @@ -607,6 +665,7 @@ $json = json_decode($results, true); + @@ -616,6 +675,7 @@ $json = json_decode($results, true); +

Test Results

+

Test Results
ECW5211 Result ECW5410 Result EC420 ResultWF188N Result
Test CaseCategoryCategory Description
5540
2237
2420
5215
2236
2419
5650
5216
4325
4323
5217
4326
4324
5251
5252
5250
5248
5249
diff --git a/py-scripts/tip-cicd-sanity/sanity_status.json b/py-scripts/tip-cicd-sanity/sanity_status.json index a0d9d4c0..4e64ff67 100755 --- a/py-scripts/tip-cicd-sanity/sanity_status.json +++ b/py-scripts/tip-cicd-sanity/sanity_status.json @@ -1 +1 @@ -{"sanity_status": {"ea8300": "failed", "ecw5211": "failed", "ecw5410": "failed", "ec420": "failed"}, "sanity_run": {"new_data": "yes"}} \ No newline at end of file +{"sanity_status": {"ea8300": "failed", "ecw5211": "failed", "ecw5410": "failed", "ec420": "failed", "wf188n": "failed"}, "sanity_run": {"new_data": "yes"}} \ No newline at end of file