Fix vFWCL Heat template for instantiation with Robot

[demo.git] / heat / vFWCL / vFWSNK / base_vfw.yaml

diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml
index 6ecae84..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
@@ -160,7 +164,6 @@ parameters:
   nexus_artifact_repo:
     type: string
     description: Root URL for the Nexus repository for Maven artifacts.
-    #default: "https://nexus.onap.org"
   cloud_env:
     type: string
     label: Cloud environment
@@ -202,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
@@ -212,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 }
 
@@ -224,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
@@ -234,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 }