Improve CBA to derive variables from others on same level

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Templates / base_template-template.vtl

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
index 990e720..76eda6d 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
@@ -77,37 +77,25 @@
             "param-name": "int_private1_gw_ip",
             "param-value": "${int_private1_gw_ip}"
         },
-        {
-            "param-name": "int_private1_net_id",
-            "param-value": "${vnf-id}-unprotected-network"
-        },
         {
             "param-name": "int_private1_subnet_id",
-            "param-value": "${vnf-id}-unprotected-network-subnet-1"
+            "param-value": "unprotected-network-subnet-1"
         },
         {
             "param-name": "int_private2_gw_ip",
             "param-value": "${int_private2_gw_ip}"
         },
-        {
-            "param-name": "int_private2_net_id",
-            "param-value": "${vnf-id}-protected-network"
-        },
         {
             "param-name": "int_private2_subnet_id",
-            "param-value": "${vnf-id}-protected-network-subnet-1"
+            "param-value": "protected-network-subnet-1"
         },
         {
             "param-name": "onap_private_gw_ip",
             "param-value": "${onap_private_gw_ip}"
         },
-        {
-            "param-name": "onap_private_net_id",
-            "param-value": "${vnf-id}-management-network"
-        },
         {
             "param-name": "onap_private_subnet_id",
-            "param-value": "${vnf-id}-namagement-network-subnet-1"
+            "param-value": "management-network-subnet-1"
         }
     ]
 }