From 8076a87e542a67f321f84311350d20946bee14a2 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 13 Nov 2018 11:34:48 -0500 Subject: fixes from vCPE testing Issue-ID: INT-717 Change-Id: If2c44e08288eee955b7a3548a802be37a15a601e Signed-off-by: Brian Freeman --- test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json | 4 ++++ test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json | 2 +- test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json | 2 +- test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json | 8 ++++---- test/vcpe/preload_templates/template_sniro_request.json | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) (limited to 'test/vcpe/preload_templates') diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json index f57c90e2b..7ef2fb7db 100644 --- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json @@ -84,6 +84,10 @@ "vnf-parameter-value": "10.4.0.0/24" }, { + "vnf-parameter-name": "sdnc_ip_addr", + "vnf-parameter-value": "${sdnc_brg_bng_ip}" + }, + { "vnf-parameter-name": "vbng_private_ip_0", "vnf-parameter-value": "10.3.0.1" }, diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json index eb684369c..7072f6825 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": "10.0.7.1" + "vnf-parameter-value": "${sdnc_brg_bng_ip}" }, { "vnf-parameter-name": "vbrgemu_name_0", diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json index 856212bb3..ced57ca6a 100644 --- a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json @@ -112,7 +112,7 @@ ] }, "vf-module-assignments": {}, "vf-module-topology-identifier": { - "vf-module-name": "zRegionOne{$vgw_vfmod_name_index}_base_vcpe_vgw_0" + "vf-module-name": "zRegionOne${vgw_vfmod_name_index}_base_vcpe_vgw_0" } }, "vnf-resource-assignments": {}, diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json index 27259546b..d2072e2e6 100644 --- a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json +++ b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json @@ -105,11 +105,11 @@ }, { "vnf-parameter-name": "mr_ip_addr", - "vnf-parameter-value": "10.12.5.239" + "vnf-parameter-value": "${mr_ip_addr}" }, { "vnf-parameter-name": "mr_ip_port", - "vnf-parameter-value": "30227" + "vnf-parameter-value": "${mr_ip_port}" }, { "vnf-parameter-name": "vaaa_name_0", @@ -153,11 +153,11 @@ }, { "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.3.0" + "vnf-parameter-value": "1.3.0-SNAPSHOT" }, { "vnf-parameter-name": "install_script_version", - "vnf-parameter-value": "1.2.0-SNAPSHOT" + "vnf-parameter-value": "1.3.0-SNAPSHOT" }, { "vnf-parameter-name": "key_name", diff --git a/test/vcpe/preload_templates/template_sniro_request.json b/test/vcpe/preload_templates/template_sniro_request.json index 565e14cd1..6fdbb7072 100644 --- a/test/vcpe/preload_templates/template_sniro_request.json +++ b/test/vcpe/preload_templates/template_sniro_request.json @@ -14,7 +14,7 @@ }, "method" : "POST", "base64Body" : "${base64_sniro_data}", - "url" : "https://${sniro_ip}:8080/adapters/rest/SDNCNotify/SNIROResponse" + "url" : " http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SNIROResponse" } } } -- cgit 1.2.3-korg