X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvfw-template.vtl;h=414d68654bcc6e503e57c36d1a83e620610f932b;hb=refs%2Fchanges%2F04%2F103004%2F3;hp=820df768c3a57e2985ba57961f3fc9ad3b0b3158;hpb=7d44d14b86dd4858afadb55c9ca38a4251e13dac;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index 820df768..414d6865 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -38,10 +38,6 @@
                         {
                             "param-name": "VF_MODULE_LABEL",
                             "param-value": "${vf-module-label}"
-                        },
-                        {
-                            "param-name": "VF_MODULE_TYPE",
-                            "param-value": "${vf-module-type}"
                         }
                     ]
                 }
@@ -96,6 +92,19 @@
                     ]
                 }
             ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_name_0",
+                            "resource-value": "${vf_module_name}"
+                        }
+                    ]
+                }
+            ]
         }
     ],
     "resource-accumulator-resolved-data": [
@@ -238,22 +247,6 @@
         {
             "param-name": "k8s-rb-profile-namespace",
             "param-value": "${k8s-rb-profile-namespace}"
-        },
-        {
-            "param-name": "onap_private_net_id",
-            "param-value": "${vnf-id}-management-network"
-        },
-        {
-            "param-name": "int_private2_net_id",
-            "param-value": "${vnf-id}-protected-network"
-        },
-        {
-            "param-name": "int_private1_net_id",
-            "param-value": "${vnf-id}-unprotected-network"
-        },
-        {
-            "param-name": "vfw_name_0",
-            "param-value": "vfw-${vf-module-id}"
         }
     ]
 }