1 files changed, 58 insertions, 69 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl
index 18ebc0035..be5b6c0f0 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-template.vtl
@@ -1,73 +1,62 @@
 {
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
+    "capability-data": [
         {
-          "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": "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}"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    }
-  ],
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vf-naming-policy",
-      "param-value": "${vf-naming-policy}"
-    },
-    {
-      "param-name": "config.test",
-      "param-value": "${config.test}"
-    },
-    {
-      "param-name": "fiveg0_snssai",
-      "param-value": "${fiveg0_snssai}"
-    },
-    {
-      "param-name": "snssai",
-      "param-value": "${fiveg0_snssai}"
-    },
-    {
-      "param-name": "config.supportedNssai.sNssai.snssai",
-      "param-value": "${fiveg0_snssai}"
-    },
-    {
-      "param-name": "config.singletest",
-      "param-value": "${singletest}"
-    }
-  ]
+    ],
+    "resource-accumulator-resolved-data": [
+	    {
+            "param-name": "vnf-id",
+            "param-value": "${vnf-id}"
+        },
+        {
+            "param-name": "vf-naming-policy",
+            "param-value": "${vf-naming-policy}"
+        },
+		
+		{
+            "param-name": "fivegc0_snssai",
+            "param-value": "${fivegc0_snssai}"
+        },
+        {
+            "param-name": "config.supportedNssai.sNssai.snssai",
+            "param-value": "${fivegc0_snssai}"
+        }
+    ]
 }