From 63a0afd8ee0062f8998214973ef3ccd62f2c3bf7 Mon Sep 17 00:00:00 2001 From: Yang Xu Date: Tue, 20 Nov 2018 16:01:01 -0500 Subject: Fix issues in vcpe test script 1. SDNC GRA url issue 2. Add mr ip and port to prepload 3. Allow SO service_recipe table to be populated 4. Add SDNC ip to preload 5. Add vfmoduleName section in SO request 6. Set Generic NeutronNet shared as False Change-Id: Iba4ff695759ceab53e33367092b6b59678e082e7 Issue-ID: INT-717 Signed-off-by: Yang Xu (cherry picked from commit 1a0a0466716419880ab6b1fc6a94ec82a2966cb0) --- test/vcpe/preload_templates/simple_neutron_heat.yaml | 2 +- test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json | 2 +- test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json | 2 +- test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/vcpe/preload_templates') 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", -- cgit 1.2.3-korg