Updates for ssl sdc
Issue-ID: INT-1265
Change-Id: I64971740c8ae9aee60a06ca1d0e5ff02ccbc9a88
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/test/vcpe/sdcutils.py b/test/vcpe/sdcutils.py
index 60050a4..2cf2a64 100755
--- a/test/vcpe/sdcutils.py
+++ b/test/vcpe/sdcutils.py
@@ -23,7 +23,7 @@
url = self.vcpecommon.sdc_service_list_url
self.logger.info(url)
- r = requests.get(url, headers=self.vcpecommon.sdc_be_request_headers, auth=self.vcpecommon.sdc_be_request_userpass)
+ r = requests.get(url, headers=self.vcpecommon.sdc_be_request_headers, auth=self.vcpecommon.sdc_be_request_userpass, verify=False)
self.logger.debug(r)
data = r.json()
@@ -48,7 +48,7 @@
def download_file(self, url):
self.logger.info(url)
- response = requests.get(url, headers=self.vcpecommon.sdc_be_request_headers, auth=self.vcpecommon.sdc_be_request_userpass)
+ response = requests.get(url, headers=self.vcpecommon.sdc_be_request_headers, auth=self.vcpecommon.sdc_be_request_userpass, verify=False)
filename = 'csar/' + self.get_filename_from_cd(response.headers.get('Content-Disposition'))
open(filename, 'wb').write(response.content)
@@ -59,7 +59,7 @@
"""
url = self.vcpecommon.sdc_get_category_list_url
self.logger.info(url)
- resp = requests.get(url, headers=self.vcpecommon.sdc_fe_request_headers, auth=self.vcpecommon.sdc_fe_request_userpass)
+ resp = requests.get(url, headers=self.vcpecommon.sdc_fe_request_headers, auth=self.vcpecommon.sdc_fe_request_userpass, verify=False)
data = resp.json()
self.logger.debug('---------------------------------------------------------------')
@@ -79,7 +79,7 @@
url = self.vcpecommon.sdc_create_allotted_resource_subcategory_url
self.logger.info(url)
details = {"name" : newSubcategory}
- resp = requests.post(url, headers=self.vcpecommon.sdc_fe_request_headers, auth=self.vcpecommon.sdc_fe_request_userpass, json=details)
+ resp = requests.post(url, headers=self.vcpecommon.sdc_fe_request_headers, auth=self.vcpecommon.sdc_fe_request_userpass, json=details, verify=False)
self.logger.debug('---------------------------------------------------------------')
self.logger.debug('------- Creation subcategory request submitted to SDC, got response --------')
self.logger.debug('response code = %s' % resp.status_code )
diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py
index 4e00aae..e4e90db 100755
--- a/test/vcpe/vcpecommon.py
+++ b/test/vcpe/vcpecommon.py
@@ -149,16 +149,16 @@
#############################################################################################
# SDC urls
- self.sdc_be_port = '30205'
+ self.sdc_be_port = '30204'
self.sdc_be_request_userpass = 'vid', 'Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U'
self.sdc_be_request_headers = {'X-ECOMP-InstanceID': 'VID'}
- self.sdc_be_url_prefix = 'http://' + self.hosts['sdc'] + ':' + self.sdc_be_port
+ self.sdc_be_url_prefix = 'https://' + self.hosts['sdc'] + ':' + self.sdc_be_port
self.sdc_service_list_url = self.sdc_be_url_prefix + '/sdc/v1/catalog/services'
- self.sdc_fe_port = '30206'
+ self.sdc_fe_port = '30207'
self.sdc_fe_request_userpass = 'beep', 'boop'
self.sdc_fe_request_headers = {'USER_ID': 'demo', 'Content-Type': 'application/json'}
- self.sdc_fe_url_prefix = 'http://' + self.hosts['sdc'] + ':' + self.sdc_fe_port
+ self.sdc_fe_url_prefix = 'https://' + self.hosts['sdc'] + ':' + self.sdc_fe_port
self.sdc_get_category_list_url = self.sdc_fe_url_prefix + '/sdc1/feProxy/rest/v1/categories'
self.sdc_create_allotted_resource_subcategory_url = self.sdc_fe_url_prefix + '/sdc1/feProxy/rest/v1/category/resources/resourceNewCategory.allotted%20resource/subCategory'