SO-3835 Modify-Config flow of slice (Day-2) -snssai not updated in config map of the NFs

Issue-ID: SO-3835

Change-Id: I7578b3292b625e0773ee67a0b6db60c8e192fe1a
Signed-off-by: Rudrangi Anupriya <ra00745022@techmahindra.com>

30 files changed, 1248 insertions, 1839 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-mapping.json
deleted file mode 100644
index 069d58d3f..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-mapping.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-  {
-    "name": "vf-module-model-invariant-uuid",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "vf-module-model-version",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "k8s-rb-profile-namespace",
-    "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "k8s-rb-profile-name",
-    "property": {
-      "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "fiveg0_snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "fiveg0_snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.test",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.test",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.singletest",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "singletest",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.amfName",
-    "property": {
-      "description": "amf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.amfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "amfName",
-    "property": {
-      "description": "amf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "amfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.supportedNssai.sNssai.snssai",
-    "property": {
-      "description": "supportedNssai.sNssai.snssai properties",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.supportedNssai.sNssai.snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": []
-  }
-]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl
deleted file mode 100644
index b2abaae51..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/amf-template.vtl
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf-module-name}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "vfmt"
-            },
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "config.amfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "amfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "vf-module-model-invariant-uuid",
-      "param-value": "${vf-module-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "config.test",
-      "param-value": "${config.test}"
-    },
-    {
-      "param-name": "vf-module-id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "profile-${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "ns-${vf-module-id}"
-    },
-    {
-      "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}"
-    }
-  ]
-}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-mapping.json
deleted file mode 100644
index cceb4fe3a..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-mapping.json
+++ /dev/null
@@ -1,166 +0,0 @@
-[
-  {
-    "name": "vf-module-model-invariant-uuid",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "vf-module-model-version",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "k8s-rb-profile-namespace",
-    "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "k8s-rb-profile-name",
-    "property": {
-      "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  }
-]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl
deleted file mode 100644
index fcee84620..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/base_template-template.vtl
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf-module-name}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "vfmt"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": ""
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "vf-module-model-invariant-uuid",
-      "param-value": "${vf-module-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf-module-id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "profile-${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "ns-${vf-module-id}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    }
-  ]
-}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-mapping.json
index e5cc9b6a3..9bfa103aa 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-mapping.json
@@ -1,42 +1,42 @@
-[
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  }
-]
+[

+  {

+    "name": "service-instance-id",

+    "property": {

+      "description": "",

+      "required": false,

+      "type": "string",

+      "status": "",

+      "constraints": [

+        {}

+      ],

+      "entry_schema": {

+        "type": ""

+      }

+    },

+    "input-param": false,

+    "dictionary-name": "service-instance-id",

+    "dictionary-source": "input",

+    "dependencies": [],

+    "version": 0

+  },

+  {

+    "name": "vnf-id",

+    "property": {

+      "description": "",

+      "required": false,

+      "type": "string",

+      "status": "",

+      "constraints": [

+        {}

+      ],

+      "entry_schema": {

+        "type": ""

+      }

+    },

+    "input-param": false,

+    "dictionary-name": "vnf-id",

+    "dictionary-source": "input",

+    "dependencies": [],

+    "version": 0

+  }

+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-template.vtl
index b45b814e9..822626c3d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfig-template.vtl
@@ -1,12 +1,12 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    }
-  ]
-}
+{

+    "resource-accumulator-resolved-data": [

+		{

+            "param-name": "service-instance-id",

+            "param-value": "${service-instance-id}"

+        },

+		{

+            "param-name": "vnf-id",

+            "param-value": "${vnf-id}"

+        }	

+	]

+}	
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-mapping.json
index 104f6e989..a3b4e3586 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-mapping.json
@@ -1,56 +1,56 @@
-[
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "supportedNssai",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "default": "hello"
-    },
-    "input-param": false,
-    "dictionary-name": "supportedNssai",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  }
-]
+[

+  {

+    "name": "service-instance-id",

+    "property": {

+      "description": "",

+      "required": false,

+      "type": "string",

+      "status": "",

+      "constraints": [

+        {}

+      ],

+      "entry_schema": {

+        "type": ""

+      }

+    },

+    "input-param": false,

+    "dictionary-name": "service-instance-id",

+    "dictionary-source": "input",

+    "dependencies": [],

+    "version": 0

+  },

+  {

+    "name": "vnf-id",

+    "property": {

+      "description": "",

+      "required": false,

+      "type": "string",

+      "status": "",

+      "constraints": [

+        {}

+      ],

+      "entry_schema": {

+        "type": ""

+      }

+    },

+    "input-param": false,

+    "dictionary-name": "vnf-id",

+    "dictionary-source": "input",

+    "dependencies": [],

+    "version": 0

+  },

+  {

+	"name": "supportedNssai",

+	"property": {

+		"description": "",

+		"required": false,

+		"type": "string",

+		"default": "hello"

+	},

+	"input-param": false,

+	"dictionary-name": "supportedNssai",

+	"dictionary-source": "input",

+	"dependencies": [],

+	"version": 0

+  }

+]
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-template.vtl
index 1967a20bd..afda3c735 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/baseconfigput-template.vtl
@@ -1,16 +1,16 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "supportedNssai",
-      "param-value": "${supportedNssai}"
-    }
-  ]
-}
+{

+    "resource-accumulator-resolved-data": [

+		{

+            "param-name": "service-instance-id",

+            "param-value": "${service-instance-id}"

+        },

+		{

+            "param-name": "vnf-id",

+            "param-value": "${vnf-id}"

+        },

+		{

+            "param-name": "supportedNssai",

+            "param-value": "${supportedNssai}"

+        }		

+	]

+}	
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-mapping.json
new file mode 100644
index 000000000..9dc90f2f5
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-mapping.json
@@ -0,0 +1,63 @@
+[

+    {

+        "name": "service-instance-id",

+        "property": {

+            "description": "",

+            "required": false,

+            "type": "string",

+            "status": "",

+            "constraints": [

+                {}

+            ],

+            "entry_schema": {

+                "type": ""

+            }

+        },

+        "input-param": false,

+        "dictionary-name": "service-instance-id",

+        "dictionary-source": "input",

+        "dependencies": [],

+        "version": 0

+    },

+    {

+        "name": "vnf-id",

+        "property": {

+            "description": "",

+            "required": false,

+            "type": "string"

+        },

+        "input-param": false,

+        "dictionary-name": "vnf-id",

+        "dictionary-source": "input",

+        "dependencies": [],

+        "version": 0

+    },

+    {

+        "name": "vf-modules-list-sdnc",

+        "property": {

+            "description": "list of modules associated with vnf from MDSAL",

+            "type": "json"

+        },

+        "input-param": false,

+        "dictionary-name": "vf-modules-list",

+        "dictionary-source": "sdnc",

+        "dependencies": [

+            "service-instance-id",

+            "vnf-id"

+        ]

+    },

+    {

+        "name": "vf-modules-list-aai",

+        "property": {

+            "description": "list of modules associated with vnf from AAI",

+            "type": "json"

+        },

+        "input-param": false,

+        "dictionary-name": "vf-modules-list",

+        "dictionary-source": "aai-data",

+        "dependencies": [

+            "service-instance-id",

+            "vnf-id"

+        ]

+    }

+]

diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-template.vtl
new file mode 100644
index 000000000..9d4e340f3
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-aai-template.vtl
@@ -0,0 +1 @@
+${vf-modules-list-aai}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-mapping.json
new file mode 100644
index 000000000..9dc90f2f5
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-mapping.json
@@ -0,0 +1,63 @@
+[

+    {

+        "name": "service-instance-id",

+        "property": {

+            "description": "",

+            "required": false,

+            "type": "string",

+            "status": "",

+            "constraints": [

+                {}

+            ],

+            "entry_schema": {

+                "type": ""

+            }

+        },

+        "input-param": false,

+        "dictionary-name": "service-instance-id",

+        "dictionary-source": "input",

+        "dependencies": [],

+        "version": 0

+    },

+    {

+        "name": "vnf-id",

+        "property": {

+            "description": "",

+            "required": false,

+            "type": "string"

+        },

+        "input-param": false,

+        "dictionary-name": "vnf-id",

+        "dictionary-source": "input",

+        "dependencies": [],

+        "version": 0

+    },

+    {

+        "name": "vf-modules-list-sdnc",

+        "property": {

+            "description": "list of modules associated with vnf from MDSAL",

+            "type": "json"

+        },

+        "input-param": false,

+        "dictionary-name": "vf-modules-list",

+        "dictionary-source": "sdnc",

+        "dependencies": [

+            "service-instance-id",

+            "vnf-id"

+        ]

+    },

+    {

+        "name": "vf-modules-list-aai",

+        "property": {

+            "description": "list of modules associated with vnf from AAI",

+            "type": "json"

+        },

+        "input-param": false,

+        "dictionary-name": "vf-modules-list",

+        "dictionary-source": "aai-data",

+        "dependencies": [

+            "service-instance-id",

+            "vnf-id"

+        ]

+    }

+]

diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-template.vtl
new file mode 100644
index 000000000..ae6efa758
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/config-deploy-sdnc-template.vtl
@@ -0,0 +1 @@
+${vf-modules-list-sdnc}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-mapping.json
new file mode 100644
index 000000000..aee7200cf
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-mapping.json
@@ -0,0 +1,152 @@
+[
+    {
+        "name": "vf-module-model-invariant-uuid",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-invariant-uuid",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+	 {
+        "name": "fivegc0_snssai",
+        "property": {
+            "description": "",
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "fivegc0_snssai",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ]
+    },
+    {
+        "name": "vf-module-model-version",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-version",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+    {
+        "name": "management-prefix-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "management-prefix-id",
+        "dictionary-source": "processor-db",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "service-instance-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "service-instance-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-label",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-label",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vf-module-model-customization-uuid",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-customization-uuid",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-naming-policy",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vnf-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vnf_name",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf_name",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl
new file mode 100644
index 000000000..6cc18ff1a
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_amf-template.vtl
@@ -0,0 +1,138 @@
+{
+    "capability-data": [
+        {
+            "capability-name": "generate-name",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vf_module_name",
+                            "resource-value": "${vf-module-name}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "vfmt"
+                        },
+                        {
+                            "param-name": "resource-name",
+                            "param-value": "vf_module_name"
+                        },
+                        {
+                            "param-name": "resource-value",
+                            "param-value": "${vf-module-name}"
+                        },
+                        {
+                            "param-name": "external-key",
+                            "param-value": "${vf-module-id}_vf-module-name"
+                        },
+                        {
+                            "param-name": "policy-instance-name",
+                            "param-value": "${vf-naming-policy}"
+                        },
+                        {
+                            "param-name": "naming-type",
+                            "param-value": "VF-MODULE"
+                        },
+                        {
+                            "param-name": "VNF_NAME",
+                            "param-value": "${vnf_name}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_LABEL",
+                            "param-value": "${vf-module-label}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": ""
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "config.amfName",
+                            "resource-value": "amf"
+                        }
+                    ]
+                }
+            ]
+        },
+		{
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "amfName",
+                            "resource-value": "amf"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "vf-module-model-invariant-uuid",
+            "param-value": "${vf-module-model-invariant-uuid}"
+        },
+           {
+            "param-name": "vf-module-label",
+            "param-value": "${vf-module-label}"
+        },
+        {
+            "param-name": "vf-module-model-version",
+            "param-value": "${vf-module-model-version}"
+        },
+		{
+            "param-name": "vnf-id",
+            "param-value": "${vnf-id}"
+        },
+		{
+            "param-name": "vf-module-id",
+            "param-value": "${vf-module-id}"
+        },
+		{
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "profile-${vf-module-id}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "ns-${vf-module-id}"
+        },
+          {
+            "param-name": "k8s-rb-instance-release-name",
+            "param-value": "release-${vf-module-id}"
+        },
+         {
+            "param-name": "vf-module-model-customization-uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+		{
+            "param-name": "fivegc0_snssai",
+            "param-value": "${fivegc0_snssai}"
+        },
+        {
+            "param-name": "config.supportedNssai.sNssai.snssai",
+            "param-value": "${fivegc0_snssai}"
+        }
+		
+		
+    ]
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-mapping.json
new file mode 100644
index 000000000..c8b82ea20
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-mapping.json
@@ -0,0 +1,153 @@
+[
+    {
+        "name": "vf-module-model-invariant-uuid",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-invariant-uuid",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+	 {
+        "name": "fivegc0_snssai",
+        "property": {
+            "description": "",
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "fivegc0_snssai",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ]
+    },
+	
+    {
+        "name": "vf-module-model-version",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-version",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+    {
+        "name": "management-prefix-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "management-prefix-id",
+        "dictionary-source": "processor-db",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "service-instance-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "service-instance-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-label",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-label",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vf-module-model-customization-uuid",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-customization-uuid",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-naming-policy",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vnf-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vnf_name",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf_name",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl
new file mode 100644
index 000000000..ba834e8e5
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_smf-template.vtl
@@ -0,0 +1,138 @@
+{
+    "capability-data": [
+        {
+            "capability-name": "generate-name",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vf_module_name",
+                            "resource-value": "${vf-module-name}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "vfmt"
+                        },
+                        {
+                            "param-name": "resource-name",
+                            "param-value": "vf_module_name"
+                        },
+                        {
+                            "param-name": "resource-value",
+                            "param-value": "${vf-module-name}"
+                        },
+                        {
+                            "param-name": "external-key",
+                            "param-value": "${vf-module-id}_vf-module-name"
+                        },
+                        {
+                            "param-name": "policy-instance-name",
+                            "param-value": "${vf-naming-policy}"
+                        },
+                        {
+                            "param-name": "naming-type",
+                            "param-value": "VF-MODULE"
+                        },
+                        {
+                            "param-name": "VNF_NAME",
+                            "param-value": "${vnf_name}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_LABEL",
+                            "param-value": "${vf-module-label}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": ""
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "config.smfName",
+                            "resource-value": "smf"
+                        }
+                    ]
+                }
+            ]
+        },
+		{
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "smfName",
+                            "resource-value": "smf"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "vf-module-model-invariant-uuid",
+            "param-value": "${vf-module-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vf-module-model-version",
+            "param-value": "${vf-module-model-version}"
+        },
+		{
+            "param-name": "vnf-id",
+            "param-value": "${vnf-id}"
+        },
+		{
+            "param-name": "vf-module-id",
+            "param-value": "${vf-module-id}"
+        },
+         {
+            "param-name": "vf-module-label",
+            "param-value": "${vf-module-label}"
+        },
+       
+		{
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "profile-${vf-module-id}"
+        },
+         {
+            "param-name": "k8s-rb-instance-release-name",
+            "param-value": "release-${vf-module-id}"
+        },
+        {
+            "param-name": "vf-module-model-customization-uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "ns-${vf-module-id}"
+        },
+		
+		{
+            "param-name": "fivegc0_snssai",
+            "param-value": "${fivegc0_snssai}"
+        },
+        {
+            "param-name": "config.supportedNssai.sNssai.snssai",
+            "param-value": "${fivegc0_snssai}"
+        }
+    ]
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-mapping.json
new file mode 100644
index 000000000..c8b82ea20
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-mapping.json
@@ -0,0 +1,153 @@
+[
+    {
+        "name": "vf-module-model-invariant-uuid",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-invariant-uuid",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+	 {
+        "name": "fivegc0_snssai",
+        "property": {
+            "description": "",
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "fivegc0_snssai",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ]
+    },
+	
+    {
+        "name": "vf-module-model-version",
+        "property": {
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-version",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ]
+    },
+    {
+        "name": "management-prefix-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "management-prefix-id",
+        "dictionary-source": "processor-db",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "service-instance-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "service-instance-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-module-label",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-label",
+        "dictionary-source": "processor-db",
+        "dependencies": [
+            "vf-module-model-customization-uuid"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vf-module-model-customization-uuid",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-module-model-customization-uuid",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-naming-policy",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    },
+    {
+        "name": "vnf-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
+    },
+    {
+        "name": "vnf_name",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf_name",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    }
+]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl
new file mode 100644
index 000000000..a62807ac9
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/helm_upf-template.vtl
@@ -0,0 +1,141 @@
+{
+    "capability-data": [
+        {
+            "capability-name": "generate-name",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vf_module_name",
+                            "resource-value": "${vf-module-name}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "vfmt"
+                        },
+                        {
+                            "param-name": "resource-name",
+                            "param-value": "vf_module_name"
+                        },
+                        {
+                            "param-name": "resource-value",
+                            "param-value": "${vf-module-name}"
+                        },
+
+                        {
+                            "param-name": "external-key",
+                            "param-value": "${vf-module-id}_vf-module-name"
+                        },
+                        {
+                            "param-name": "policy-instance-name",
+                            "param-value": "${vf-naming-policy}"
+                        },
+                        {
+                            "param-name": "naming-type",
+                            "param-value": "VF-MODULE"
+                        },
+                        {
+                            "param-name": "VNF_NAME",
+                            "param-value": "${vnf_name}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_LABEL",
+                            "param-value": "${vf-module-label}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": ""
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "config.upfName",
+                            "resource-value": "upf"
+                        }
+                    ]
+                }
+            ]
+        },
+		{
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "upfName",
+                            "resource-value": "upf"
+                        }
+                    ]
+                }
+            ]
+        }
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "vf-module-model-invariant-uuid",
+            "param-value": "${vf-module-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vf-module-model-version",
+            "param-value": "${vf-module-model-version}"
+        },
+		{
+            "param-name": "vnf-id",
+            "param-value": "${vnf-id}"
+        },
+         {
+            "param-name": "vf-module-label",
+            "param-value": "${vf-module-label}"
+        },
+       
+		
+		{
+            "param-name": "vf-module-id",
+            "param-value": "${vf-module-id}"
+        },
+		{
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "profile-${vf-module-id}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "ns-${vf-module-id}"
+        },
+         {
+            "param-name": "k8s-rb-instance-release-name",
+            "param-value": "release-${vf-module-id}"
+        },
+		
+          {
+            "param-name": "vf-module-model-customization-uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+		{
+            "param-name": "fivegc0_snssai",
+            "param-value": "${fivegc0_snssai}"
+        },
+        {
+            "param-name": "config.supportedNssai.sNssai.snssai",
+            "param-value": "${fivegc0_snssai}"
+        }
+	
+    ]
+}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/amf-config-template.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_amf-config-template.tar.gz
index 439c26e93..439c26e93 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/amf-config-template.tar.gz
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_amf-config-template.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/template-profile.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_amf-profile.tar.gz
index fbdcfb64c..fbdcfb64c 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/template-profile.tar.gz
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_amf-profile.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/smf-config-template.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_smf-config-template.tar.gz
index 49fe8c323..49fe8c323 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/smf-config-template.tar.gz
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_smf-config-template.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_smf-profile.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_smf-profile.tar.gz
new file mode 100644
index 000000000..fbdcfb64c
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_smf-profile.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/upf-config-template.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_upf-config-template.tar.gz
index ba799ab8f..ba799ab8f 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/upf-config-template.tar.gz
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_upf-config-template.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_upf-profile.tar.gz b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_upf-profile.tar.gz
new file mode 100644
index 000000000..fbdcfb64c
--- /dev/null
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/k8s-profiles/helm_upf-profile.tar.gz
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-mapping.json
deleted file mode 100644
index 152b9c4d1..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-mapping.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-  {
-    "name": "vf-module-model-invariant-uuid",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "vf-module-model-version",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "k8s-rb-profile-namespace",
-    "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "k8s-rb-profile-name",
-    "property": {
-      "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "fiveg0_snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "fiveg0_snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.test",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.test",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.singletest",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "singletest",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.smfName",
-    "property": {
-      "description": "smf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.smfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "smfName",
-    "property": {
-      "description": "smf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "smfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.supportedNssai.sNssai.snssai",
-    "property": {
-      "description": "supportedNssai.sNssai.snssai properties",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.supportedNssai.sNssai.snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": []
-  }
-]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl
deleted file mode 100644
index c858d09f4..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/smf-template.vtl
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf-module-name}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "vfmt"
-            },
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "config.smfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "smfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "vf-module-model-invariant-uuid",
-      "param-value": "${vf-module-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "config.test",
-      "param-value": "${config.test}"
-    },
-    {
-      "param-name": "vf-module-id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "profile-${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "ns-${vf-module-id}"
-    },
-    {
-      "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}"
-    }
-  ]
-}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-mapping.json
deleted file mode 100644
index 2673457cb..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-mapping.json
+++ /dev/null
@@ -1,261 +0,0 @@
-[
-  {
-    "name": "vf-module-model-invariant-uuid",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-invariant-uuid",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "vf-module-model-version",
-    "property": {
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-version",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ]
-  },
-  {
-    "name": "management-prefix-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "management-prefix-id",
-    "dictionary-source": "processor-db",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-module-label",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-label",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vf-module-model-customization-uuid",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf_name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "k8s-rb-profile-namespace",
-    "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "k8s-rb-profile-name",
-    "property": {
-      "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "k8s-rb-profile-name",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "fiveg0_snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "fiveg0_snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.test",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.test",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.singletest",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "singletest",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.upfName",
-    "property": {
-      "description": "upf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.upfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "upfName",
-    "property": {
-      "description": "upf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "upfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.supportedNssai.sNssai.snssai",
-    "property": {
-      "description": "supportedNssai.sNssai.snssai properties",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.supportedNssai.sNssai.snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": []
-  }
-]
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl
deleted file mode 100644
index 75b172347..000000000
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/upf-template.vtl
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf-module-name}"
-            }
-          ],
-          "payload": [
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "vfmt"
-            },
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": ""
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "config.upfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "upfName",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "vf-module-model-invariant-uuid",
-      "param-value": "${vf-module-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-customization-uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vnf-id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "config.test",
-      "param-value": "${config.test}"
-    },
-    {
-      "param-name": "vf-module-id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "profile-${vf-module-id}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "ns-${vf-module-id}"
-    },
-    {
-      "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}"
-    }
-  ]
-}
diff --git a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-mapping.json
index 69bb79b94..926ca7e6e 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS/Templates/vnf-mapping.json
@@ -1,203 +1,67 @@
 [
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
+    {
+        "name": "vnf-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "vnf-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vf-naming-policy",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
+    {
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "default": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP"
+        },
+        "input-param": false,
+        "dictionary-name": "vf-naming-policy",
+        "dictionary-source": "default",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "aic-cloud-region",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
+    {
+        "name": "aic-cloud-region",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "aic-cloud-region",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string"
+    {
+        "name": "service-instance-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "service-instance-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "fiveg0_snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "fiveg0_snssai",
-    "dictionary-source": "input",
-    "dependencies": []
-  },
-  {
-    "name": "snssai",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.test",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.test",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.singletest",
-    "property": {
-      "description": "",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "singletest",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.amfName",
-    "property": {
-      "description": "amf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.amfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "amfName",
-    "property": {
-      "description": "amf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "amfName",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.smfName",
-    "property": {
-      "description": "smf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.smfName",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "smfName",
-    "property": {
-      "description": "smf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "smfName",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.upfName",
-    "property": {
-      "description": "upf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.upfName",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "upfName",
-    "property": {
-      "description": "upf name",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "upfName",
-    "dictionary-source": "input",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "config.supportedNssai.sNssai.snssai",
-    "property": {
-      "description": "supportedNssai.sNssai.snssai properties",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "config.supportedNssai.sNssai.snssai",
-    "dictionary-source": "sdnc",
-    "dependencies": []
-  }
+   {
+        "name": "fivegc0_snssai",
+        "property": {
+            "description": "",
+            "type": "string"
+        },
+        "input-param": false,
+        "dictionary-name": "fivegc0_snssai",
+        "dictionary-source": "input",
+        "dependencies": [ ]
+    }   
 ]
+ 
\ No newline at end of file
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}"
+        }
+    ]
 }