From 5174f5a6d7a6e71f1cbbbfb4e0ac5f97040a38a3 Mon Sep 17 00:00:00 2001
From: bealler <alex.beall@netexperience.com>
Date: Tue, 15 Dec 2020 15:51:52 -0500
Subject: [PATCH] Set variable portal type (needed for auth)

---
 py-scripts/tip-cicd-sanity/Nightly_Sanity.py  | 6 +++---
 py-scripts/tip-cicd-sanity/Throughput_Test.py | 7 ++-----
 py-scripts/tip-cicd-sanity/cloudsdk.py        | 4 ++--
 py-scripts/tip-cicd-sanity/lab_ap_info.py     | 4 ++++
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
index ee6a9388..63877319 100755
--- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
+++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
@@ -238,6 +238,7 @@ 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
+from lab_ap_info import cloud_type
 
 ##Test Cases to be included in Test Runs
 test_cases = [
@@ -342,7 +343,7 @@ with open(report_path + today + '/report_data.json', 'w') as report_json_file:
     json.dump(report_data, report_json_file)
 
 ###Get Cloud Bearer Token
-bearer = CloudSDK.get_bearer(cloudSDK_url)
+bearer = CloudSDK.get_bearer(cloudSDK_url, cloud_type)
 
 ############################################################################
 #################### Jfrog Firmware Check ##################################
@@ -367,7 +368,7 @@ for model in ap_models:
 
 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)
+    bearer = CloudSDK.get_bearer(cloudSDK_url, cloud_type)
 
     ###Get Current AP Firmware and upgrade
     equipment_id = equipment_id_dict[key]
@@ -375,7 +376,6 @@ for key in equipment_id_dict:
     ap_username = "root"
     ap_password = eqiupment_credentials_dict[key]
     print("AP MODEL UNDER TEST IS", key)
-    # ap_fw = CloudSDK.ap_firmware(customer_id,equipment_id,cloudSDK_url,bearer)
     try:
         ap_cli_info = ssh_cli_active_fw(ap_ip, ap_username, ap_password)
         ap_cli_fw = ap_cli_info['active_fw']
diff --git a/py-scripts/tip-cicd-sanity/Throughput_Test.py b/py-scripts/tip-cicd-sanity/Throughput_Test.py
index 13048d20..d869b410 100755
--- a/py-scripts/tip-cicd-sanity/Throughput_Test.py
+++ b/py-scripts/tip-cicd-sanity/Throughput_Test.py
@@ -72,13 +72,10 @@ 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
+from lab_ap_info import cloud_type
 #import json file to determine if throughput should be run for specific AP model
 sanity_status = json.load(open("sanity_status.json"))
 
-
-#bearer = CloudSDK.get_bearer(cloudSDK_url)
-#print(bearer)
-
 #create CSV file for test run
 today = str(date.today())
 csv_file = csv_path+"throughput_test_"+today+".csv"
@@ -101,7 +98,7 @@ for key in equipment_id_dict:
     if sanity_status['sanity_status'][key] == "passed":
         logger.info("Running throughput test on " + key)
         ##Get Bearer Token to make sure its valid (long tests can require re-auth)
-        bearer = CloudSDK.get_bearer(cloudSDK_url)
+        bearer = CloudSDK.get_bearer(cloudSDK_url, cloud_type)
         ###Get Current AP Firmware
         equipment_id = equipment_id_dict[key]
         ap_fw = CloudSDK.ap_firmware(customer_id, equipment_id, cloudSDK_url, bearer)
diff --git a/py-scripts/tip-cicd-sanity/cloudsdk.py b/py-scripts/tip-cicd-sanity/cloudsdk.py
index 6299f6ee..ff4b59fc 100755
--- a/py-scripts/tip-cicd-sanity/cloudsdk.py
+++ b/py-scripts/tip-cicd-sanity/cloudsdk.py
@@ -42,8 +42,8 @@ class CloudSDK:
     def __init__(self):
         self.user = user
 
-    def get_bearer(cloudSDK_url):
-        cloud_login_url = cloudSDK_url+"/management/v1/oauth2/token"
+    def get_bearer(cloudSDK_url, cloud_type):
+        cloud_login_url = cloudSDK_url+"/management/"+cloud_type+"/oauth2/token"
         payload = '''
         {
         "userId": "'''+user+'''",
diff --git a/py-scripts/tip-cicd-sanity/lab_ap_info.py b/py-scripts/tip-cicd-sanity/lab_ap_info.py
index 26787e6c..3b466434 100755
--- a/py-scripts/tip-cicd-sanity/lab_ap_info.py
+++ b/py-scripts/tip-cicd-sanity/lab_ap_info.py
@@ -1,7 +1,11 @@
 #!/usr/bin/python3
 
+##AP Models Under Test
 ap_models = ["ec420","ea8300","ecw5211","ecw5410"]
 
+##Cloud Type(cloudSDK = v1, CMAP = cmap)
+cloud_type = "v1"
+
 ##AP Models for firmware upload
 cloud_sdk_models = {
     "ec420": "EC420-G1",