From a048fec05a8a42bd326ee463721f3b64d83b6b56 Mon Sep 17 00:00:00 2001
From: bealler <alex.beall@netexperience.com>
Date: Tue, 15 Dec 2020 12:50:58 -0500
Subject: [PATCH] Use customer ID from lab_ap_info

---
 py-scripts/tip-cicd-sanity/Nightly_Sanity.py  | 2 +-
 py-scripts/tip-cicd-sanity/Throughput_Test.py | 2 +-
 py-scripts/tip-cicd-sanity/lab_ap_info.py     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
index 577a6da8..ee6a9388 100755
--- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
+++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
@@ -237,6 +237,7 @@ from lab_ap_info import cloud_sdk_models
 from lab_ap_info import equipment_ip_dict
 from lab_ap_info import eqiupment_credentials_dict
 from lab_ap_info import ap_models
+from lab_ap_info import customer_id
 
 ##Test Cases to be included in Test Runs
 test_cases = [
@@ -369,7 +370,6 @@ for key in equipment_id_dict:
     bearer = CloudSDK.get_bearer(cloudSDK_url)
 
     ###Get Current AP Firmware and upgrade
-    customer_id = "2"
     equipment_id = equipment_id_dict[key]
     ap_ip = equipment_ip_dict[key]
     ap_username = "root"
diff --git a/py-scripts/tip-cicd-sanity/Throughput_Test.py b/py-scripts/tip-cicd-sanity/Throughput_Test.py
index 4ef294ee..13048d20 100755
--- a/py-scripts/tip-cicd-sanity/Throughput_Test.py
+++ b/py-scripts/tip-cicd-sanity/Throughput_Test.py
@@ -71,6 +71,7 @@ from lab_ap_info import profile_info_dict
 from lab_ap_info import ap_models
 from lab_ap_info import mimo_2dot4g
 from lab_ap_info import mimo_5g
+from lab_ap_info import customer_id
 #import json file to determine if throughput should be run for specific AP model
 sanity_status = json.load(open("sanity_status.json"))
 
@@ -102,7 +103,6 @@ for key in equipment_id_dict:
         ##Get Bearer Token to make sure its valid (long tests can require re-auth)
         bearer = CloudSDK.get_bearer(cloudSDK_url)
         ###Get Current AP Firmware
-        customer_id = "2"
         equipment_id = equipment_id_dict[key]
         ap_fw = CloudSDK.ap_firmware(customer_id, equipment_id, cloudSDK_url, bearer)
         fw_model = ap_fw.partition("-")[0]
diff --git a/py-scripts/tip-cicd-sanity/lab_ap_info.py b/py-scripts/tip-cicd-sanity/lab_ap_info.py
index 6d8c7b70..26787e6c 100755
--- a/py-scripts/tip-cicd-sanity/lab_ap_info.py
+++ b/py-scripts/tip-cicd-sanity/lab_ap_info.py
@@ -31,6 +31,9 @@ sanity_status = {
     "ec420": 'failed'
 }
 
+##Customer ID for testing
+customer_id = "2"
+
 ##Equipment IDs for Lab APs under test
 equipment_id_dict = {
     "ea8300": "19",