summaryrefslogtreecommitdiffstats
path: root/kubernetes/robot/resources
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-04-26 14:38:05 -0500
committerBrian Freeman <bf1936@att.com>2019-04-26 14:38:12 -0500
commit6a723151618121c503ed55e91afdfd3f89da2361 (patch)
tree25e532157d6b3378a239a2ce6d841c7ee393e051 /kubernetes/robot/resources
parent32ad67ddd03acdacb333b3bf33d26e8d8056723f (diff)
Fix preload for vFWCL instantiate
synch preload for vpkg_preload for Vnf_Orchestration and Demo so that the same network prefix is used for vPKG that is created when vFWSNK is instantiated. Issue-ID: INT-1039 Change-Id: I312f19068cd6b5fc2e9213f1134bf6d7da97e9cb Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'kubernetes/robot/resources')
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
index aa97252f09..d58e1389cd 100644
--- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
+++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py
@@ -87,8 +87,9 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
},
"vpkg_preload.template": {
- "unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}",
- "unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}",
+ # vFWSNK_ prepended to vpkg since the default behoir for vFWSNK tempalte is to concatenate vnf_name and network_name
+ "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}",
+ "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}",
"unprotected_private_net_cidr" : "192.168.10.0/24",
"protected_private_net_cidr" : "192.168.20.0/24",
"vfw_private_ip_0" : "192.168.10.100",