X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvnf-template.vtl;fp=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvnf-template.vtl;h=5a963205e5d9cbac5d29fba2bd659f54d9941df1;hp=9f6e96aee4d8351b3a86e437098517697f285e4e;hb=734b3d2134b4e1dd3cd946b8badd2baf83f97110;hpb=d2e7ad9353fcd3fde078a1f2dea85dbe26871626

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 9f6e96ae..5a963205 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -1,44 +1,5 @@
 {
     "capability-data": [
-        {
-            "capability-name": "generate-name",
-            "key-mapping": [
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "vnf_name",
-                            "resource-value": "${vnf_name}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "resource-name",
-                            "param-value": "vnf_name"
-                        },
-                        {
-                            "param-name": "resource-value",
-                            "param-value": "${vnf_name}"
-                        },
-                        {
-                            "param-name": "external-key",
-                            "param-value": "${vnf-id}_vnf_name"
-                        },
-                        {
-                            "param-name": "policy-instance-name",
-                            "param-value": "${vf-naming-policy}"
-                        },
-                        {
-                            "param-name": "naming-type",
-                            "param-value": "VNF"
-                        },
-                        {
-                            "param-name": "AIC_CLOUD_REGION",
-                            "param-value": "${aic-cloud-region}"
-                        }
-                    ]
-                }
-            ]
-        },
         {
             "capability-name": "netbox-ip-assign",
             "key-mapping": [
@@ -227,6 +188,10 @@
         }
     ],
     "resource-accumulator-resolved-data": [
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
         {
             "param-name": "vf-naming-policy",
             "param-value": "${vf-naming-policy}"