From 93a1f36105d05f9378f3f3ded383912495cfac4a Mon Sep 17 00:00:00 2001
From: bealler <alex.beall@netexperience.com>
Date: Tue, 24 Nov 2020 20:08:32 -0500
Subject: [PATCH] Minor print changes, reformat of README file

---
 py-scripts/tip-cicd-sanity/Nightly_Sanity.py  |  4 +-
 py-scripts/tip-cicd-sanity/README.md          | 48 +++++++++----------
 py-scripts/tip-cicd-sanity/cluster_version.py |  4 --
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
index 75481b28..03455332 100755
--- a/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
+++ b/py-scripts/tip-cicd-sanity/Nightly_Sanity.py
@@ -66,7 +66,7 @@ cloudSDK_url=os.getenv('CLOUD_SDK_URL')
 local_dir=os.getenv('SANITY_LOG_DIR')
 report_path=os.getenv('SANITY_REPORT_DIR')
 report_template=os.getenv('REPORT_TEMPLATE')
-print(report_path)
+
 ## TestRail Information
 tr_user=os.getenv('TR_USER')
 tr_pw=os.getenv('TR_PWD')
@@ -283,6 +283,7 @@ try:
     print(cluster_ver)
     print("-------------------------------------------")
 
+    logger.info('CloudSDK version info:'+cluster_ver)
     cloudsdk_cluster_info = {}
     for line in cluster_ver.splitlines():
         (key, val) = line.split("=")
@@ -291,6 +292,7 @@ try:
 except:
     cluster_ver = 'error'
     print("ERROR: CloudSDK Version Unavailable")
+    logger.info('CloudSDK version Unavailable')
     cloudsdk_cluster_info = {
         "date" : "unknown",
         "commitId" : "unknown",
diff --git a/py-scripts/tip-cicd-sanity/README.md b/py-scripts/tip-cicd-sanity/README.md
index 872aa2ab..cac8f2aa 100644
--- a/py-scripts/tip-cicd-sanity/README.md
+++ b/py-scripts/tip-cicd-sanity/README.md
@@ -27,35 +27,35 @@ For each AP model:
 ## Environment Variables
 Environment variables required to run scripts and modules in this directory
 #### Nightly_Sanity.py		
-CLOUD_SDK_URL: CloudSDK URL for API calls
-SANITY_LOG_DIR: Logger file directory
-SANITY_REPORT_DIR: Report file directory
-REPORT_TEMPLATE: Report template path
-TR_USER: TestRail Username
-TR_PWD: TestRail Password
-MILESTONE: TestRail Milestone ID
-PROJECT_ID: TestRail Project ID
-EAP_IDENTITY: EAP identity for testing
-EAP_PWD: EAP password for testing
-AP_USER: Username for AP
-JFROG_USER: Jfrog username
-JFROG_PWD: Jfrog password
+CLOUD_SDK_URL: CloudSDK URL for API calls  
+SANITY_LOG_DIR: Logger file directory  
+SANITY_REPORT_DIR: Report file directory 
+REPORT_TEMPLATE: Report template path  
+TR_USER: TestRail Username  
+TR_PWD: TestRail Password  
+MILESTONE: TestRail Milestone ID  
+PROJECT_ID: TestRail Project ID  
+EAP_IDENTITY: EAP identity for testing  
+EAP_PWD: EAP password for testing  
+AP_USER: Username for AP  
+JFROG_USER: Jfrog username  
+JFROG_PWD: Jfrog password  
 		
 #### cloudsdk.py		
-CLOUDSDK_USER: CloudSDK username
-CLOUDSDK_PWD: CloudSDK password
+CLOUDSDK_USER: CloudSDK username  
+CLOUDSDK_PWD: CloudSDK password  
 		
 #### cluster_version.py		
-AWS_USER: CloudSDK username
-AWS_PWD: CloudSDK password
+AWS_USER: CloudSDK username  
+AWS_PWD: CloudSDK password  
 		
 #### testrail_api.py		
-TR_USER	tr_user	TestRail Username
-TR_PWD	tr_pw	TestRail Password
+TR_USER	tr_user	TestRail Username  
+TR_PWD	tr_pw	TestRail Password  
 		
 #### Throughput_Test.py		
-CLOUD_SDK_URL: CloudSDK URL for API calls
-CSV_PATH: Path for CSV file
-EAP_IDENTITY: EAP identity for testing
-EAP_PWD: EAP password for testing
-TPUT_LOG_DIR: Logger file directory
+CLOUD_SDK_URL: CloudSDK URL for API calls  
+CSV_PATH: Path for CSV file  
+EAP_IDENTITY: EAP identity for testing  
+EAP_PWD: EAP password for testing  
+TPUT_LOG_DIR: Logger file directory  
diff --git a/py-scripts/tip-cicd-sanity/cluster_version.py b/py-scripts/tip-cicd-sanity/cluster_version.py
index baba0da5..68e1a355 100644
--- a/py-scripts/tip-cicd-sanity/cluster_version.py
+++ b/py-scripts/tip-cicd-sanity/cluster_version.py
@@ -18,7 +18,6 @@ import subprocess
 user=os.getenv('AWS_USER')
 password=os.getenv('AWS_PWD')
 chromedriver_dir=os.getenv('CHROMEDRIVER_PATH')
-print(chromedriver_dir)
 
 def main():
     chrome_options = webdriver.ChromeOptions()
@@ -57,9 +56,6 @@ def main():
     # //*[@id="env-var-linux"]/div[2]/text()
     # //*[@id="env-var-linux"]/div[3]/text()
 
-
-    #os.chdir('/Users/bealla/.kube')
-
     os.environ['AWS_ACCESS_KEY_ID'] = AWS_ACCESS_KEY_ID
     os.environ['AWS_SECRET_ACCESS_KEY'] = AWS_SECRET_ACCESS_KEY
     os.environ['AWS_SESSION_TOKEN'] = AWS_SESSION_TOKEN