diff options
| -rwxr-xr-x | test/vcpe/vcpe.py | 6 | ||||
| -rwxr-xr-x | test/vcpe/vcpecommon.py | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 3221d482a..f8c9b81aa 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -1,7 +1,8 @@ #! /usr/bin/python import logging -logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(name)s.%(funcName)s(): %(message)s') +logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(name)s.%(funcName)s(): %(message)s') +#logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(name)s.%(funcName)s(): %(message)s') import sys from vcpecommon import * @@ -191,7 +192,8 @@ def init(): def init_sdc(vcpecommon): sdc = sdcutils.SdcUtils(vcpecommon) - sdc.create_allotted_resource_subcategory('BRG') + # default SDC creates BRG - remove this in frankfurt + #sdc.create_allotted_resource_subcategory('BRG') def download_vcpe_service_templates(vcpecommon): diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index e4e90db8a..bb83c2dcb 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -103,7 +103,7 @@ class VcpeCommon: self.mr_ip_addr = self.oom_so_sdnc_aai_ip self.mr_ip_port = '30227' self.so_nbi_port = '30277' if self.oom_mode else '8080' - self.sdnc_preloading_port = '30202' if self.oom_mode else '8282' + self.sdnc_preloading_port = '30267' if self.oom_mode else '8282' self.aai_query_port = '30233' if self.oom_mode else '8443' self.sniro_port = '30288' if self.oom_mode else '8080' @@ -170,13 +170,13 @@ class VcpeCommon: self.sdnc_db_pass = 'gamma' self.sdnc_db_port = '32774' self.sdnc_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} - self.sdnc_preload_network_url = 'http://' + self.hosts['sdnc'] + \ + self.sdnc_preload_network_url = 'https://' + self.hosts['sdnc'] + \ ':' + self.sdnc_preloading_port + '/restconf/operations/VNF-API:preload-network-topology-operation' - self.sdnc_preload_vnf_url = 'http://' + self.hosts['sdnc'] + \ + self.sdnc_preload_vnf_url = 'https://' + self.hosts['sdnc'] + \ ':' + self.sdnc_preloading_port + '/restconf/operations/VNF-API:preload-vnf-topology-operation' - self.sdnc_preload_gra_url = 'http://' + self.hosts['sdnc'] + \ + self.sdnc_preload_gra_url = 'https://' + self.hosts['sdnc'] + \ ':' + self.sdnc_preloading_port + '/restconf/operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation' - self.sdnc_ar_cleanup_url = 'http://' + self.hosts['sdnc'] + ':' + self.sdnc_preloading_port + \ + self.sdnc_ar_cleanup_url = 'https://' + self.hosts['sdnc'] + ':' + self.sdnc_preloading_port + \ '/restconf/config/GENERIC-RESOURCE-API:' ############################################################################################# |