Fix vFWCL Heat template for instantiation with Robot

- Don't use vnf_name as private network name prefix. Added a new parameter named net_prefix

Change-Id: I2b54f49ce40635e1e5869dab8290f3dfc4ef6f16
Issue-ID: INT-853
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index 6b7e334..c7d3c03 100644 (file)
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -37,6 +37,7 @@ parameters:
   onap_private_net_cidr: 10.0.0.0/16
 
   # METADATA
+  net_prefix: vFWSNK
   vnf_name: vFWSNK
   vnf_id: vFirewall_demo_app
   vf_module_id: vFirewallCL

diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index fe7d96c..a11d4b4 100644 (file)
--- a/heat/vFWCL/vFWSNK/base_vfw.yaml
+++ b/heat/vFWCL/vFWSNK/base_vfw.yaml
@@ -125,6 +125,10 @@ parameters:
     type: string
     label: VNF NAME
     description: The VNF NAME is provided by ONAP
+  net_prefix:
+    type: string
+    label: Network prefix
+    description: Prefix for private network names - Workaround for Dublin
   vnf_id:
     type: string
     label: VNF ID
@@ -201,7 +205,7 @@ resources:
           template: vnfname_netid
           params:
             netid: { get_param: int_unprotected_private_net_id }
-            vnfname: { get_param: vnf_name }
+            vnfname: { get_param: net_prefix }
 
   int_unprotected_private_subnet:
     type: OS::Neutron::Subnet
@@ -211,7 +215,7 @@ resources:
           template: vnfname_subnetid
           params:
             subnetid: { get_param: int_unprotected_private_subnet_id }
-            vnfname: { get_param: vnf_name }
+            vnfname: { get_param: net_prefix }
       network: { get_resource: int_unprotected_private_network }
       cidr: { get_param: unprotected_private_net_cidr }
 
@@ -223,7 +227,7 @@ resources:
           template: vnfname_netid
           params:
             netid: { get_param: int_protected_private_net_id }
-            vnfname: { get_param: vnf_name }
+            vnfname: { get_param: net_prefix }
 
   int_protected_private_subnet:
     type: OS::Neutron::Subnet
@@ -233,7 +237,7 @@ resources:
           template: vnfname_subnetid
           params:
             subnetid: { get_param: int_protected_private_subnet_id }
-            vnfname: { get_param: vnf_name }
+            vnfname: { get_param: net_prefix }
       network: { get_resource: int_protected_private_network }
       cidr: { get_param: protected_private_net_cidr }