diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/vcpe/config_sdnc_so.py | 2 | ||||
| -rwxr-xr-x | test/vcpe/preload.py | 3 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/simple_neutron_heat.yaml | 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 | 2 | ||||
| -rw-r--r-- | test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json | 8 | ||||
| -rwxr-xr-x | test/vcpe/soutils.py | 12 | ||||
| -rwxr-xr-x | test/vcpe/vcpe.py | 2 | ||||
| -rwxr-xr-x | test/vcpe/vcpe_custom_service.py | 4 | ||||
| -rwxr-xr-x | test/vcpe/vcpecommon.py | 14 |
10 files changed, 31 insertions, 20 deletions
diff --git a/test/vcpe/config_sdnc_so.py b/test/vcpe/config_sdnc_so.py index 7c063b5fd..2cfc0f9f3 100755 --- a/test/vcpe/config_sdnc_so.py +++ b/test/vcpe/config_sdnc_so.py @@ -78,7 +78,9 @@ def insert_customer_service_to_so(vcpecommon): "`SERVICE_MODEL_UUID`) VALUES ('createInstance','1','{0}'," \ "'/mso/async/services/CreateVcpeResCustService',NULL,181,NULL, NOW()," \ "'{1}');".format(parser.svc_model['modelName'], parser.svc_model['modelVersionId'])) + vcpecommon.execute_cmds_so_db(cmds) + cmds = [] cmds.append("delete from `heat_template_params` where" "`HEAT_TEMPLATE_ARTIFACT_UUID`='efee1d84-b8ec-11e7-abc4-cec278b6b50a';") cmds.append("delete from `heat_template` where ARTIFACT_UUID='efee1d84-b8ec-11e7-abc4-cec278b6b50a';") diff --git a/test/vcpe/preload.py b/test/vcpe/preload.py index 0d451d24f..0108566da 100755 --- a/test/vcpe/preload.py +++ b/test/vcpe/preload.py @@ -128,7 +128,7 @@ class Preload: } replace_dict.update(commont_dict) self.logger.info('Preloading vGW-GRA') - return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_vnf_url) + return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_gra_url) def preload_vfmodule(self, template_file, service_instance_id, vnf_model, vfmodule_model, common_dict, name_suffix): """ @@ -156,6 +156,7 @@ class Preload: '${vnf_name}': vfmodule_name, '${mr_ip_addr}': self.vcpecommon.mr_ip_addr, '${mr_ip_port}': self.vcpecommon.mr_ip_port, + '${sdnc_oam_ip}': self.vcpecommon.sdnc_oam_ip, '${suffix}': name_suffix} replace_dict.update(common_dict) self.logger.info('Preloading VF Module ' + vfmodule_name) diff --git a/test/vcpe/preload_templates/simple_neutron_heat.yaml b/test/vcpe/preload_templates/simple_neutron_heat.yaml index d20c08127..f64248be8 100644 --- a/test/vcpe/preload_templates/simple_neutron_heat.yaml +++ b/test/vcpe/preload_templates/simple_neutron_heat.yaml @@ -8,7 +8,7 @@ parameters: shared: type: boolean description: Shared amongst tenants - default: True + default: False outputs: network_id: description: Openstack network identifier diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json index 7ef2fb7db..0758dc189 100644 --- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json @@ -85,7 +85,7 @@ }, { "vnf-parameter-name": "sdnc_ip_addr", - "vnf-parameter-value": "${sdnc_brg_bng_ip}" + "vnf-parameter-value": "${sdnc_oam_ip}" }, { "vnf-parameter-name": "vbng_private_ip_0", diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index 7072f6825..9e04b998e 100644 --- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json @@ -63,7 +63,7 @@ }, { "vnf-parameter-name": "sdnc_ip", - "vnf-parameter-value": "${sdnc_brg_bng_ip}" + "vnf-parameter-value": "${sdnc_oam_ip}" }, { "vnf-parameter-name": "vbrgemu_name_0", diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json index 87059e1e6..fef5cbb96 100644 --- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json @@ -47,15 +47,15 @@ }, { "vnf-parameter-name": "vgw_private_ip_0", - "vnf-parameter-value": "10.5.0.92" + "vnf-parameter-value": "10.5.0.111" }, { "vnf-parameter-name": "vgw_private_ip_1", - "vnf-parameter-value": "10.0.101.92" + "vnf-parameter-value": "10.0.101.111" }, { "vnf-parameter-name": "vgw_private_ip_2", - "vnf-parameter-value": "10.2.0.7" + "vnf-parameter-value": "10.2.0.26" }, { "vnf-parameter-name": "vgw_name_0", @@ -67,7 +67,7 @@ }, { "vnf-parameter-name": "vg_vgmux_tunnel_vni", - "vnf-parameter-value": "92" + "vnf-parameter-value": "111" }, { "vnf-parameter-name": "onap_private_net_id", diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index 3749689f2..76031276e 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -177,8 +177,16 @@ class SoUtils: { 'name': 'BRG_WAN_MAC_Address', 'value': brg_mac - } - , + }, + { + 'name': 'VfModuleNames', + 'value': [ + { + 'VfModuleModelInvariantUuid': 'c16ad38c-2c2c-49ae-bbe8-66c7ffbcc30a', + 'VfModuleName': 'VGW2BRG-fa:16:3e:5c:27:8b' + } + ] + }, { "name": "Customer_Location", "value": self.vcpecommon.customer_location_used_by_oof diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 8bd39960a..925f11df4 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -174,7 +174,7 @@ def init_so_sdnc(): logger = logging.getLogger('__name__') vcpecommon = VcpeCommon() config_sdnc_so.insert_customer_service_to_so(vcpecommon) - config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon) + #config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon) vgw_vfmod_name_index= 0 vcpecommon.save_object(vgw_vfmod_name_index, vcpecommon.vgw_vfmod_name_index_file) diff --git a/test/vcpe/vcpe_custom_service.py b/test/vcpe/vcpe_custom_service.py index f02802353..408f8a8c4 100755 --- a/test/vcpe/vcpe_custom_service.py +++ b/test/vcpe/vcpe_custom_service.py @@ -75,7 +75,7 @@ class CustomService: # get name index self.vgw_vfmod_name_index= self.vcpecommon.load_object(self.vcpecommon.vgw_vfmod_name_index_file) self.vgw_vfmod_name_index=self.vgw_vfmod_name_index + 1 - self.save_object(vgw_vfmod_name_index,self.vcpecommon.vgw_vfmod_name_index_file) + self.vcpecommon.save_object(self.vgw_vfmod_name_index,self.vcpecommon.vgw_vfmod_name_index_file) # preload vGW if preload_dict: preloader = preload.Preload(self.vcpecommon) @@ -83,7 +83,7 @@ class CustomService: self.vcpecommon.increase_ip_address_or_vni_in_template(vgw_template_file, parameters_to_change) preloader.preload_vgw(vgw_template_file, brg_mac, preload_dict, name_suffix) # preload vGW-GRA - preloader.preload_vgw_gra(vgw_gra_template_file, brg_mac, preload_dict, name_suffix, vgw_vfmod_name_index) + preloader.preload_vgw_gra(vgw_gra_template_file, brg_mac, preload_dict, name_suffix, str(self.vgw_vfmod_name_index)) # create service so = soutils.SoUtils(self.vcpecommon, 'v5') diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index f5e1b3046..29aad1960 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -34,8 +34,8 @@ class VcpeCommon: } common_preload_config = { - 'oam_onap_net': 'oam_network_0qV7' if oom_mode else 'oam_onap_lAky', - 'oam_onap_subnet': 'oam_network_0qV7' if oom_mode else 'oam_onap_lAky', + 'oam_onap_net': 'oam_network_AiBB' if oom_mode else 'oam_onap_lAky', + 'oam_onap_subnet': 'oam_network_AiBB' if oom_mode else 'oam_onap_lAky', 'public_net': 'external', 'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4' } @@ -68,13 +68,13 @@ class VcpeCommon: self.logger.info('Initializing configuration') # OOM: this is the address that the brg and bng will nat for config of brg - 10.0.0.x address of k8 host for sdnc - self.sdnc_brg_bng_ip = self.get_pod_node_oam_ip(self.sdnc_controller_pod)[1] + self.sdnc_oam_ip = '10.0.0.20' # OOM: this is a k8 host external IP - self.oom_so_sdnc_aai_ip = '10.12.5.18' + self.oom_so_sdnc_aai_ip = '10.12.5.228' # OOM: this is a k8 host external IP can be same as oom_so_sdnc_aai_ip - self.oom_dcae_ves_collector = '10.12.5.18' + self.oom_dcae_ves_collector = '10.12.5.228' # OOM: this is a k8 host external IP can be same as oom_so_sdnc_aai_ip - self.mr_ip_addr = '10.12.5.18' + self.mr_ip_addr = '10.12.5.228' 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' @@ -136,7 +136,7 @@ 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 + '/onap/so/infra/serviceInstantiation/v7/serviceInstances', - 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infraserviceInstantiation/v7/serviceInstances'} + 'v5': 'http://' + self.hosts['so'] + ':' + self.so_nbi_port + '/onap/so/infra/serviceInstantiation/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'} |