diff options
Diffstat (limited to 'test/vcpe')
9 files changed, 41 insertions, 33 deletions
diff --git a/test/vcpe/__var/vgw_vfmod_name_index b/test/vcpe/__var/vgw_vfmod_name_index new file mode 100644 index 000000000..569369ff5 --- /dev/null +++ b/test/vcpe/__var/vgw_vfmod_name_index @@ -0,0 +1,2 @@ +I1 +.
\ No newline at end of file diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json index 0758dc189..2792cfde6 100644 --- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json @@ -129,15 +129,15 @@ }, { "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" }, { "vnf-parameter-name": "demo_artifacts_version", "vnf-parameter-value": "1.1.1" }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index 9e04b998e..2630ee7af 100644 --- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json @@ -83,15 +83,15 @@ }, { "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" }, { "vnf-parameter-name": "demo_artifacts_version", "vnf-parameter-value": "1.1.1" }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json index f3401326d..a1ebf2ad8 100644 --- a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json @@ -109,15 +109,15 @@ }, { "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" }, { "vnf-parameter-name": "demo_artifacts_version", "vnf-parameter-value": "1.1.1" }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json index f453aafe2..48883b993 100644 --- a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json @@ -95,15 +95,15 @@ }, { "name": "repo_url_artifacts", - "value": "https://nexus.onap.org/content/groups/staging" + "value": "https://nexus.onap.org/content/repositories/releases" }, { "name": "demo_artifacts_version", "value": "1.1.1" }, { - "name": "install_script_version", - "value": "1.1.1" + "name": "script_version", + "value": "1.3.0" }, { "name": "key_name", diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json index d2072e2e6..1f30e9452 100644 --- a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json @@ -149,15 +149,15 @@ }, { "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" }, { "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.3.0-SNAPSHOT" + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.3.0-SNAPSHOT" + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json index cda93becc..bd288b4dd 100644 --- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json @@ -55,15 +55,15 @@ }, { "vnf-parameter-name": "vgw_private_ip_0", - "vnf-parameter-value": "10.5.0.125" + "vnf-parameter-value": "10.5.0.126" }, { "vnf-parameter-name": "vgw_private_ip_1", - "vnf-parameter-value": "10.0.101.125" + "vnf-parameter-value": "10.0.101.126" }, { "vnf-parameter-name": "vgw_private_ip_2", - "vnf-parameter-value": "10.2.0.40" + "vnf-parameter-value": "10.2.0.41" }, { "vnf-parameter-name": "vgw_name_0", @@ -75,7 +75,7 @@ }, { "vnf-parameter-name": "vg_vgmux_tunnel_vni", - "vnf-parameter-value": "125" + "vnf-parameter-value": "126" }, { "vnf-parameter-name": "onap_private_net_id", @@ -95,15 +95,15 @@ }, { "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" }, { "vnf-parameter-name": "demo_artifacts_version", "vnf-parameter-value": "1.1.1" }, { - "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.1.1" + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py index 3fb96c55e..bb5bbb637 100755 --- a/test/vcpe/vcpe.py +++ b/test/vcpe/vcpe.py @@ -28,11 +28,15 @@ def config_sniro(vcpecommon, vgmux_svc_instance_uuid, vbrg_svc_instance_uuid): brg_ar_name = None vgw_name = None for model in parser.vnf_models: + logger.info('modelCustomizationName = %s', model['modelCustomizationName']) if 'tunnel' in model['modelCustomizationName']: + logger.info('tunnel is in %s', model['modelCustomizationName']) tunnelxconn_ar_name = model['modelCustomizationName'] elif 'brg' in model['modelCustomizationName']: + logger.info('brg is in %s', model['modelCustomizationName']) brg_ar_name = model['modelCustomizationName'] - elif 'vgw' in model['modelCustomizationName']: + #elif 'vgw' in model['modelCustomizationName']: + else: vgw_name = model['modelCustomizationName'] if not (tunnelxconn_ar_name and brg_ar_name and vgw_name): @@ -222,4 +226,6 @@ if __name__ == '__main__': closed_loop(0) elif sys.argv[1] == 'brg': deploy_brg_only() + elif sys.argv[1] == 'sniro': + tmp_sniro() diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index 18390f7fa..12ac9bd8d 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -26,16 +26,16 @@ class VcpeCommon: '--os-username': 'kxi', '--os-user-domain-id': 'default', '--os-project-domain-id': 'default', - '--os-tenant-id': 'b8ad3842ab3642f7bf3fbe4e4d3b9f86' if oom_mode else '1e097c6713e74fd7ac8e4295e605ee1e', + '--os-tenant-id': '41d6d38489bd40b09ea8a6b6b852dcbd' if oom_mode else '1e097c6713e74fd7ac8e4295e605ee1e', '--os-region-name': 'RegionOne', '--os-password': 'n3JhGMGuDzD8', - '--os-project-domain-name': 'Integration-SB-05' if oom_mode else 'Integration-SB-07', + '--os-project-domain-name': 'Integration-SB-00' if oom_mode else 'Integration-SB-07', '--os-identity-api-version': '3' } common_preload_config = { - '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', + 'oam_onap_net': 'oam_network_uB1y' if oom_mode else 'oam_onap_lAky', + 'oam_onap_subnet': 'oam_network_uB1y' if oom_mode else 'oam_onap_lAky', 'public_net': 'external', 'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4' } @@ -61,22 +61,22 @@ class VcpeCommon: global_subscriber_id = 'SDN-ETHERNET-INTERNET' project_name = 'Project-Demonstration' owning_entity_id = '520cc603-a3c4-4ec2-9ef4-ca70facd79c0' - owning_entity_name = 'OE-Demonstration' + owning_entity_name = 'OE-Demonstration1' def __init__(self, extra_host_names=None): self.logger = logging.getLogger(__name__) self.logger.info('Initializing configuration') # vgw_VfModuleModelInvariantUuid is in rescust service csar, look in service-VcpesvcRescust1118-template.yml for groups vgw module metadata. TODO: read this value automcatically - self.vgw_VfModuleModelInvariantUuid = 'c16ad38c-2c2c-49ae-bbe8-66c7ffbcc30a' + self.vgw_VfModuleModelInvariantUuid = 'feb4cfc6-e018-4e42-808d-dbf242e7f63b' # 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_oam_ip = '10.0.0.20' + self.sdnc_oam_ip = '10.0.0.10' # OOM: this is a k8 host external IP - self.oom_so_sdnc_aai_ip = '10.12.5.228' + self.oom_so_sdnc_aai_ip = '10.12.6.20' # 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.228' + self.oom_dcae_ves_collector = '10.12.6.20' # OOM: this is a k8 host external IP can be same as oom_so_sdnc_aai_ip - self.mr_ip_addr = '10.12.5.228' + self.mr_ip_addr = '10.12.6.20' 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' |