diff options
| -rwxr-xr-x | test/vcpe/preload.py | 2 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json | 2 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json | 4 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json | 2 | ||||
| -rwxr-xr-x | test/vcpe/vcpe.py | 2 | ||||
| -rwxr-xr-x | test/vcpe/vcpecommon.py | 10 |
6 files changed, 11 insertions, 11 deletions
diff --git a/test/vcpe/preload.py b/test/vcpe/preload.py index caf9eb184..d72150319 100755 --- a/test/vcpe/preload.py +++ b/test/vcpe/preload.py @@ -123,7 +123,7 @@ class Preload: def preload_vgw_gra(self, template_file, brg_mac, commont_dict, name_suffix, vgw_vfmod_name_index): replace_dict = {'${brg_mac}': brg_mac, - '${suffix}': name_suffix + '${suffix}': name_suffix, '${vgw_vfmod_name_index}': vgw_vfmod_name_index } replace_dict.update(commont_dict) diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json index a95d45671..f57c90e2b 100644 --- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json @@ -25,7 +25,7 @@ "VNF-API:vnf-parameters": [ { "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vbng-base-ubuntu-16-04" + "vnf-parameter-value": "vbng-casa-base-ubuntu-16-04" }, { "vnf-parameter-name": "vcpe_flavor_name", diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index 9a9ecc37d..cf17be0cb 100644 --- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json @@ -19,7 +19,7 @@ "VNF-API:vnf-parameters": [ { "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vbrg-base-ubuntu-16-04-new" + "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04-new" }, { "vnf-parameter-name": "vcpe_flavor_name", @@ -135,4 +135,4 @@ } } } -}
\ No newline at end of file +} diff --git a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json index 9dc747393..f3401326d 100644 --- a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json @@ -25,7 +25,7 @@ "VNF-API:vnf-parameters": [ { "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vgmux2-base-ubuntu-16-04" + "vnf-parameter-value": "vgmux-casa-base-ubuntu-16-04" }, { "vnf-parameter-name": "vcpe_flavor_name", diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index efebecb6d..b8b7108d1 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -189,7 +189,7 @@ def tmp_sniro(): config_sniro(vcpecommon, svc_instance_uuid['gmux'], svc_instance_uuid['brg']) if __name__ == '__main__': - logging.basicConfig(level=logging.INFO, format='%(message)s') + logging.basicConfig(level=logging.DEBUG, format='%(message)s') print('----------------------------------------------------------------------------------------------------') print(' vcpe.py: Brief info about this program') diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index 59286037c..89771707e 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -73,7 +73,7 @@ class VcpeCommon: self.oom_so_sdnc_aai_ip = '10.12.5.18' self.oom_dcae_ves_collector = '10.12.5.18' - self.so_nbi_port = '30223' if self.oom_mode else '8080' + self.so_nbi_port = '30277' if self.oom_mode else '8080' self.sdnc_preloading_port = '30202' 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' @@ -132,12 +132,12 @@ class VcpeCommon: ############################################################################################# # SO urls, note: do NOT add a '/' at the end of the url - self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/ecomp/mso/infra/serviceInstances/v4', - 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/ecomp/mso/infra/serviceInstances/v5'} - self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/ecomp/mso/infra/orchestrationRequests/v5' + self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/v7/serviceInstances', + 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infraserviceInstantiation/v7/serviceInstances'} + self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/orchestrationRequests/v6' self.so_userpass = 'InfraPortalClient', 'password1$' self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} - self.so_db_name = 'mso_catalog' + self.so_db_name = 'catalogdb' self.so_db_user = 'root' self.so_db_pass = 'password' self.so_db_port = '30252' if self.oom_mode else '32769' |