From 4504cf54cf1dda6a0ab7c87b5fffa93c1cd7123c Mon Sep 17 00:00:00 2001
From: bealler <alex.beall@netexperience.com>
Date: Tue, 8 Dec 2020 20:03:44 -0500
Subject: [PATCH] Cleanup unused code

---
 py-scripts/tip-cicd-sanity/Nightly_Sanity.py | 66 +-------------------
 1 file changed, 3 insertions(+), 63 deletions(-)

diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
index 948bbfb5..1f93e62e 100755
--- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
+++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
@@ -343,14 +343,10 @@ with open(report_path + today + '/report_data.json', 'w') as report_json_file:
 ###Get Cloud Bearer Token
 bearer = CloudSDK.get_bearer(cloudSDK_url)
 
-#############################################################################
-##################### CloudSDK Firmware Check ###############################
-### 1) Get Token for CloudSDK ###############################################
-### 2) Find Latest FW on jfrog for each AP Model ############################
-### 3) Find Available FW on CloudSDK --> if Latest FW not present, upload ###
-#############################################################################
+############################################################################
+#################### Jfrog Firmware Check ##################################
+############################################################################
 
-###Check Latest FW Version on jfrog and CloudSDK for each model
 for model in ap_models:
     apModel = model
     cloudModel = cloud_sdk_models[apModel]
@@ -764,18 +760,6 @@ for key in equipment_id_dict:
 
         time.sleep(10)
 
-        # TC 2234 - 2.4 GHz Open
-        # test_case = "2234"
-        # radio = "wiphy0"
-        # station = ["test2234"]
-        # ssid_name = profile_info_dict[fw_model]["twoFourG_OPEN_SSID"]
-        # ssid_psk = "BLANK"
-        # security = "open"
-        # test_result = Test.Single_Client_Connectivity(port, radio, ssid_name, ssid_psk, security, station, test_case, rid)
-        # report_data['tests'][key][int(test_case)] = test_result
-
-        # time.sleep(10)
-
         # TC5215 - 5 GHz WPA2-Enterprise
         test_case = "5215"
         radio = "wiphy3"
@@ -835,16 +819,6 @@ for key in equipment_id_dict:
 
         time.sleep(10)
 
-        # TC 2235 - 5 GHz Open
-        # test_case = "2235"
-        # radio = "wiphy3"
-        # station = ["test2235"]
-        # ssid_name = profile_info_dict[fw_model]["fiveG_OPEN_SSID"]
-        # ssid_psk = "BLANK"
-        # security = "open"
-        # test_result = Test.Single_Client_Connectivity(radio, ssid_name, ssid_psk, security, station, test_case, rid)
-        # report_data['tests'][key][int(test_case)] = test_result
-
         logger.info("Testing for " + fw_model + "Bridge Mode SSIDs Complete")
         with open(report_path + today + '/report_data.json', 'w') as report_json_file:
             json.dump(report_data, report_json_file)
@@ -975,18 +949,6 @@ for key in equipment_id_dict:
 
         time.sleep(10)
 
-        # TC 4321 - 2.4 GHz Open NAT
-        # test_case = "4321"
-        # radio = "wiphy0"
-        # station = ["test4321"]
-        # ssid_name = profile_info_dict[fw_model+'_nat']["twoFourG_OPEN_SSID"]
-        # ssid_psk = "BLANK"
-        # security = "open"
-        # test_result = Test.Single_Client_Connectivity(port, radio, ssid_name, ssid_psk, security, station, test_case, rid)
-        # report_data['tests'][key][int(test_case)] = test_result
-
-        # time.sleep(10)
-
         # TC5108 - 5 GHz WPA2-Enterprise NAT
         test_case = "5217"
         radio = "wiphy3"
@@ -1046,16 +1008,6 @@ for key in equipment_id_dict:
 
         time.sleep(10)
 
-        # TC 4322 - 5 GHz Open NAT
-        # test_case = "4322"
-        # radio = "wiphy3"
-        # station = ["test4322"]
-        # ssid_name = profile_info_dict[fw_model+'_nat']["fiveG_OPEN_SSID"]
-        # ssid_psk = "BLANK"
-        # security = "open"
-        # test_result = Test.Single_Client_Connectivity(port, radio, ssid_name, ssid_psk, security, station, test_case, rid)
-        # report_data['tests'][key][int(test_case)] = test_result
-
         logger.info("Testing for " + fw_model + "NAT Mode SSIDs Complete")
         with open(report_path + today + '/report_data.json', 'w') as report_json_file:
             json.dump(report_data, report_json_file)
@@ -1186,18 +1138,6 @@ for key in equipment_id_dict:
 
         time.sleep(10)
 
-        # TC 4321 - 2.4 GHz Open VLAN
-        # test_case = "4321"
-        # radio = "wiphy0"
-        # station = ["test4321"]
-        # ssid_name = profile_info_dict[fw_model+'_vlan']["twoFourG_OPEN_SSID"]
-        # ssid_psk = "BLANK"
-        # security = "open"
-        # test_result = Test.Single_Client_Connectivity(port, radio, ssid_name, ssid_psk, security, station, test_case, rid)
-        # report_data['tests'][key][int(test_case)] = test_result
-
-        # time.sleep(10)
-
         # TC5108 - 5 GHz WPA2-Enterprise VLAN
         test_case = "5250"
         radio = "wiphy3"