Correct CBA package for vFW_CNF_CDS usecase

This fixes change helm and cba content to enable instantiation
with some workarounds. Data dictionary in this review is not
ready yet, as well as there are many workarounds within.

Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Issue-ID: INT-1260
Change-Id: I4833fa11772b7bd2b65d04f0d81ffad22570d309

11 files changed, 1255 insertions, 1673 deletions

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
index f4580325..efedb214 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
@@ -19,27 +19,6 @@
     "dependencies": [],
     "version": 0
   },
-    {
-    "name": "vf-module-name",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "${vf-module-name}"
-    },
-    "input-param": false,
-    "dictionary-name": "vf-module-name",
-    "dictionary-source": "default",
-    "dependencies": [],
-    "version": 0
-  },
   {
     "name": "vf-module-label",
     "property": {
@@ -231,6 +210,29 @@
     "version": 0
   },
   {
+    "name": "onap_private_net_cidr",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ],
+    "version": 0
+  },
+  {
     "name": "int_private2_net_cidr",
     "property": {
       "description": "",
@@ -367,34 +369,6 @@
     ]
   },
   {
-    "name": "int_private1_net_id",
-    "property": {
-      "description": "Private unprotected network identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "int_private1_subnet_id",
-    "property": {
-      "description": "Private unprotected subnetwork identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
     "name": "int_private2_gw_ip",
     "property": {
       "description": "Private protected network gateway ip",
@@ -409,34 +383,6 @@
     ]
   },
   {
-    "name": "int_private2_net_id",
-    "property": {
-      "description": "Private protected network identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "int_private2_subnet_id",
-    "property": {
-      "description": "Private protected subnetwork identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
     "name": "onap_private_gw_ip",
     "property": {
       "description": "Private onap management network gateway ip",
@@ -449,33 +395,5 @@
       "service-instance-id",
       "vnf-id"
     ]
-  },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "Private onap management network identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "Private onap management subnetwork identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
   }
 ]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
index 06fc18eb..990e7200 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
@@ -1,160 +1,113 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "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": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-
-    {
-      "param-name": "int_private1_net_cidr",
-      "param-value": "${int_private1_net_cidr}"
-    },
-
-    {
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },
-    {
-      "param-name": "int_private1_gw_ip",
-      "param-value": "${int_private1_gw_ip}"
-    },
-    {
-      "param-name": "int_private1_net_id",
-      "param-value": "${int_private1_net_id}"
-    },
-    {
-      "param-name": "int_private1_subnet_id",
-      "param-value": "${int_private1_subnet_id}"
-    },
-    {
-      "param-name": "int_private2_gw_ip",
-      "param-value": "${int_private2_gw_ip}"
-    },
-    {
-      "param-name": "int_private2_net_id",
-      "param-value": "${int_private2_net_id}"
-    },
-    {
-      "param-name": "int_private2_subnet_id",
-      "param-value": "${int_private2_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_gw_ip",
-      "param-value": "${onap_private_gw_ip}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "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_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
+    "capability-data": [
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": "${status}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "vf-module",
+                            "param-value": "vf-module"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
+        },
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
+        {
+            "param-name": "vnf_model_customization_uuid",
+            "param-value": "${vnf-model-customization-uuid}"
+        },
+        {
+            "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": "vf_module_id",
+            "param-value": "${vf-module-id}"
+        },
+        {
+            "param-name": "vf_module_type",
+            "param-value": "${vf-module-type}"
+        },
+        {
+            "param-name": "int_private1_net_cidr",
+            "param-value": "${int_private1_net_cidr}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "pub_key",
+            "param-value": "${pub_key}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
+        },
+        {
+            "param-name": "int_private1_gw_ip",
+            "param-value": "${int_private1_gw_ip}"
+        },
+        {
+            "param-name": "int_private1_net_id",
+            "param-value": "${vnf-id}-unprotected-network"
+        },
+        {
+            "param-name": "int_private1_subnet_id",
+            "param-value": "${vnf-id}-unprotected-network-subnet-1"
+        },
+        {
+            "param-name": "int_private2_gw_ip",
+            "param-value": "${int_private2_gw_ip}"
+        },
+        {
+            "param-name": "int_private2_net_id",
+            "param-value": "${vnf-id}-protected-network"
+        },
+        {
+            "param-name": "int_private2_subnet_id",
+            "param-value": "${vnf-id}-protected-network-subnet-1"
+        },
+        {
+            "param-name": "onap_private_gw_ip",
+            "param-value": "${onap_private_gw_ip}"
+        },
+        {
+            "param-name": "onap_private_net_id",
+            "param-value": "${vnf-id}-management-network"
+        },
+        {
+            "param-name": "onap_private_subnet_id",
+            "param-value": "${vnf-id}-namagement-network-subnet-1"
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz
new file mode 100644
index 00000000..e7b49eb9
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
index 5d80f0c8..31067a35 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
@@ -305,52 +305,6 @@
     ],
     "version": 0
   },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
     {
     "name": "int_private1_net_cidr",
     "property": {
@@ -917,9 +871,37 @@
     ]
   },
   {
+    "name": "onap_private_net_id",
+    "property": {
+      "description": "onap private net id",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_net_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "onap_private_subnet_id",
+    "property": {
+      "description": "onap private subnet id",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_subnet_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private1_net_id",
     "property": {
-      "description": "Private unprotected network identification",
+      "description": "private1 net id",
       "type": "string"
     },
     "input-param": false,
@@ -933,7 +915,7 @@
   {
     "name": "int_private2_net_id",
     "property": {
-      "description": "Private protected network identification",
+      "description": "private2 net id",
       "type": "string"
     },
     "input-param": false,
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index a321aa44..c85af209 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -1,298 +1,263 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "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": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "vfw_image_name",
-      "param-value": "${vfw_image_name}"
-    },
-    {
-      "param-name": "vfw_flavor_name",
-      "param-value": "${vfw_flavor_name}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-	{
-      "param-name": "int_private1_net_cidr",
-      "param-value": "${int_private1_net_cidr}"
-    },
-	{
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-	{
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-	{
-      "param-name": "vfw_int_private1_ip_0",
-      "param-value": "${vfw_int_private1_ip_0}"
-    },
-	{
-      "param-name": "vfw_int_private2_ip_0",
-      "param-value": "${vfw_int_private2_ip_0}"
-    },
-	{
-      "param-name": "vpg_int_private1_ip_0",
-      "param-value": "${vpg_int_private1_ip_0}"
-    },
-	{
-      "param-name": "vfw_int_private2_floating_ip",
-      "param-value": "${vfw_int_private2_floating_ip}"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "$(dcae_collector_ip)"
-    },
-	{
-      "param-name": "dcae_collector_port",
-      "param-value": "$(dcae_collector_port)"
-    },
-	{
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}}"
-    },
-	{
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${vnf_name}_key_name"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "$(cloud_env)"
-    },
-	{
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-	{
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },
-    {
-      "param-name": "int_private1_net_id",
-      "param-value": "${int_private1_net_id}"
-    },
-    {
-      "param-name": "int_private2_net_id",
-      "param-value": "${int_private2_net_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vfw_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vfw_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vfw_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_name_0",
-              "resource-value": "${vfw_name_0}"
-            }
-          ]
-        },
-        {
-          "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_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vf_module_id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_onap_private_ip_0",
-              "resource-value": "${vfw_onap_private_ip_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_LABEL",
+                            "param-value": "${vf-module-label}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "${vf-module-type}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "netbox-ip-assign",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_onap_private_ip_0",
+                            "resource-value": "${vfw_onap_private_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${management-prefix-id}"
+                        },
+                        {
+                            "param-name": "vf_module_id",
+                            "param-value": "${vf-module-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": "${status}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "vf-module",
+                            "param-value": "vf-module"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
+        },
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
+        {
+            "param-name": "vnf_model_customization_uuid",
+            "param-value": "${vnf-model-customization-uuid}"
+        },
+        {
+            "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": "vf_module_id",
+            "param-value": "${vf-module-id}"
+        },
+        {
+            "param-name": "vf_module_type",
+            "param-value": "${vf-module-type}"
+        },
+        {
+            "param-name": "vf_module_customization_uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+        {
+            "param-name": "vfc_customization_uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "aic-cloud-region",
+            "param-value": "${aic-cloud-region}"
+        },
+        {
+            "param-name": "vnfc-model-customization-uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "vnfc-model-invariant-uuid",
+            "param-value": "${vnfc-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vnfc-model-version",
+            "param-value": "${vnfc-model-version}"
+        },
+        {
+            "param-name": "nfc-naming-code",
+            "param-value": "${nfc-naming-code}"
+        },
+        {
+            "param-name": "vfw_image_name",
+            "param-value": "${vfw_image_name}"
+        },
+        {
+            "param-name": "vfw_flavor_name",
+            "param-value": "${vfw_flavor_name}"
+        },
+        {
+            "param-name": "public_net_id",
+            "param-value": "${public_net_id}"
+        },
+        {
+            "param-name": "pub_key",
+            "param-value": "${pub_key}"
+        },
+        {
+            "param-name": "int_private1_net_cidr",
+            "param-value": "${int_private1_net_cidr}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_subnet_id",
+            "param-value": "${onap_private_subnet_id}"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "vfw_int_private1_ip_0",
+            "param-value": "${vfw_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vfw_int_private2_ip_0",
+            "param-value": "${vfw_int_private2_ip_0}"
+        },
+        {
+            "param-name": "vpg_int_private1_ip_0",
+            "param-value": "${vpg_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vfw_int_private2_floating_ip",
+            "param-value": "${vfw_int_private2_floating_ip}"
+        },
+        {
+            "param-name": "dcae_collector_ip",
+            "param-value": "${dcae_collector_ip}"
+        },
+        {
+            "param-name": "dcae_collector_port",
+            "param-value": "${dcae_collector_port}"
+        },
+        {
+            "param-name": "demo_artifacts_version",
+            "param-value": "${demo_artifacts_version}}"
+        },
+        {
+            "param-name": "install_script_version",
+            "param-value": "${install_script_version}"
+        },
+        {
+            "param-name": "key_name",
+            "param-value": "${vnf_name}_key_name"
+        },
+        {
+            "param-name": "cloud_env",
+            "param-value": "${cloud_env}"
+        },
+        {
+            "param-name": "sec_group",
+            "param-value": "${sec_group}"
+        },
+        {
+            "param-name": "nexus_artifact_repo",
+            "param-value": "${nexus_artifact_repo}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
+        },
+        {
+            "param-name": "onap_private_net_id",
+            "param-value": "${vnf-id}-management-network"
+        },
+        {
+            "param-name": "int_private2_net_id",
+            "param-value": "${vnf-id}-protected-network"
+        },
+        {
+            "param-name": "int_private1_net_id",
+            "param-value": "${vnf-id}-unprotected-network"
+        },
+        {
+            "param-name": "vfw_name_0",
+            "param-value": "vfw-${vf-module-id}"
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
index a1d41199..e0728241 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -115,7 +115,7 @@
       "entry_schema": {
         "type": ""
       },
-	  "default":"vpg_onap_private_ip_0"
+	  "default":"${vpg_onap_private_ip_0}"
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
@@ -437,48 +437,6 @@
     "version": 0
   },
   {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
     "name": "vfw_int_private2_ip_0",
     "property": {
       "description": "",
@@ -638,7 +596,7 @@
     "property": {
       "description": "Private unprotected network gateway ip",
       "type": "string",
-      "default": "192.168.10.1/24"
+      "default": "${int_private1_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "int_private1_gw_ip",
@@ -647,37 +605,11 @@
     ]
   },
   {
-    "name": "int_private1_net_id",
-    "property": {
-      "description": "Private unprotected network identification",
-      "type": "string",
-      "default": "${int_private1_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_net_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
-    "name": "int_private1_subnet_id",
-    "property": {
-      "description": "Private unprotected subnetwork identification",
-      "type": "string",
-      "default": "${int_private1_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
     "name": "int_private2_gw_ip",
     "property": {
       "description": "Private protected network gateway ip",
       "type": "string",
-      "default": "192.168.20.1/24"
+      "default": "${int_private2_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "int_private2_gw_ip",
@@ -686,37 +618,11 @@
     ]
   },
   {
-    "name": "int_private2_net_id",
-    "property": {
-      "description": "Private protected network identification",
-      "type": "string",
-      "default": "${int_private2_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_net_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
-    "name": "int_private2_subnet_id",
-    "property": {
-      "description": "Private protected subnetwork identification",
-      "type": "string",
-      "default": "${int_private2_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
     "name": "onap_private_gw_ip",
     "property": {
       "description": "Private onap management network gateway ip",
       "type": "string",
-      "default": "10.10.0.1/16"
+      "default": "${onap_private_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "onap_private_gw_ip",
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 617f0b97..e050c977 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -1,335 +1,360 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf-model-customization-uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vf-naming-policy",
-      "param-value": "${vf-naming-policy}"
-    },
-    {
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "flavor_name",
-      "param-value": "${flavor_name}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "int_private1_net_cidr",
-      "param-value": "${int_private1_net_cidr}"
-    },
-    {
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "${cloud_env}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-	{
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },    
-    {
-      "param-name": "int_private1_gw_ip",
-      "param-value": "${int_private1_gw_ip}"
-    },
-    {
-      "param-name": "int_private1_net_id",
-      "param-value": "${vnf_name}-unprotected-network"
-    },
-    {
-      "param-name": "int_private1_subnet_id",
-      "param-value": "${int_private1_net_id}-subnet-1"
-    },
-    {
-      "param-name": "int_private2_gw_ip",
-      "param-value": "${int_private2_gw_ip}"
-    },
-    {
-      "param-name": "int_private2_net_id",
-      "param-value": "${vnf_name}-protected-network"
-    },
-    {
-      "param-name": "int_private2_subnet_id",
-      "param-value": "${int_private2_net_id}-subnet-1"
-    },
-    {
-      "param-name": "onap_private_gw_ip",
-      "param-value": "${onap_private_gw_ip}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
+    "capability-data": [
         {
-          "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}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vnf_name",
-              "resource-value": "${vnf_name}"
-            }
-          ]
+            "capability-name": "generate-name",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vnf_name",
+                            "resource-value": "${vnf_name}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "resource-name",
+                            "param-value": "vnf_name"
+                        },
+                        {
+                            "param-name": "resource-value",
+                            "param-value": "${vnf_name}"
+                        },
+                        {
+                            "param-name": "external-key",
+                            "param-value": "${vnf-id}_vnf_name"
+                        },
+                        {
+                            "param-name": "policy-instance-name",
+                            "param-value": "${vf-naming-policy}"
+                        },
+                        {
+                            "param-name": "naming-type",
+                            "param-value": "VNF"
+                        },
+                        {
+                            "param-name": "AIC_CLOUD_REGION",
+                            "param-value": "${aic-cloud-region}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "netbox-ip-assign",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "int_private1_gw_ip",
+                            "resource-value": "${int_private1_gw_ip}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private1-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-int_private1_gw_ip"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "int_private2_gw_ip",
+                            "resource-value": "${int_private2_gw_ip}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private2-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-int_private2_gw_ip"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "onap_private_gw_ip",
+                            "resource-value": "${onap_private_gw_ip}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${management-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-onap_private_gw_ip"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_int_private2_ip_0",
+                            "resource-value": "${vfw_int_private2_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private2-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vfw_int_private2_ip_0"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_int_private1_ip_0",
+                            "resource-value": "${vfw_int_private1_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private1-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vfw_int_private1_ip_0"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_int_private2_floating_ip",
+                            "resource-value": "${vfw_int_private2_floating_ip}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private1-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vsn_int_private2_ip_0",
+                            "resource-value": "${vsn_int_private2_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private2-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vsn_int_private2_ip_0"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vpg_onap_private_ip_0",
+                            "resource-value": "${vpg_onap_private_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${management-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vpg_onap_private_ip_0"
+                        }
+                    ]
+                },
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vpg_int_private1_ip_0",
+                            "resource-value": "${vpg_int_private1_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${private1-prefix-id}"
+                        },
+                        {
+                            "param-name": "vnf-id",
+                            "param-value": "${vnf-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vnf-id}-vpg_int_private1_ip_0"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
+    ],
+    "resource-accumulator-resolved-data": [
         {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vfw_int_private2_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_int_private2_ip_0",
-              "resource-value": "${vfw_int_private2_ip_0}"
-            }
-          ]
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
         },
         {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vfw_int_private1_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_int_private1_ip_0",
-              "resource-value": "${vfw_int_private1_ip_0}"
-            }
-          ]
+            "param-name": "vnf-model-customization-uuid",
+            "param-value": "${vnf-model-customization-uuid}"
         },
         {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_int_private2_floating_ip",
-              "resource-value": "${vfw_int_private2_floating_ip}"
-            }
-          ]
+            "param-name": "aic-cloud-region",
+            "param-value": "${aic-cloud-region}"
         },
         {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private2-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vsn_int_private2_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_int_private2_ip_0",
-              "resource-value": "${vsn_int_private2_ip_0}"
-            }
-          ]
+            "param-name": "vf-naming-policy",
+            "param-value": "${vf-naming-policy}"
         },
-		{
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_onap_private_ip_0",
-              "resource-value": "${vpg_onap_private_ip_0}"
-            }
-          ]
+        {
+            "param-name": "image_name",
+            "param-value": "${image_name}"
         },
         {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private1-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_int_private1_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_int_private1_ip_0",
-              "resource-value": "${vpg_int_private1_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vnf-put",
-      "key-mapping": [
+            "param-name": "flavor_name",
+            "param-value": "${flavor_name}"
+        },
+        {
+            "param-name": "public_net_id",
+            "param-value": "${public_net_id}"
+        },
+        {
+            "param-name": "int_private1_net_cidr",
+            "param-value": "${int_private1_net_cidr}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "demo_artifacts_version",
+            "param-value": "${demo_artifacts_version}"
+        },
+        {
+            "param-name": "install_script_version",
+            "param-value": "${install_script_version}"
+        },
+        {
+            "param-name": "net_attachment_definition",
+            "param-value": "${vnf-id}-ovn-nat"
+        },
+        {
+            "param-name": "pub_key",
+            "param-value": "${pub_key}"
+        },
+        {
+            "param-name": "cloud_env",
+            "param-value": "${cloud_env}"
+        },
+        {
+            "param-name": "sec_group",
+            "param-value": "${sec_group}"
+        },
+        {
+            "param-name": "nexus_artifact_repo",
+            "param-value": "${nexus_artifact_repo}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
         {
-          "payload": [
-            {
-              "param-name": "generic-vnf",
-              "param-value": "generic-vnf"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vnf-put",
-              "resource-value": "${status}"
-            }
-          ]
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
index 03e9afa3..5c665c12 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -176,52 +176,6 @@
     "version": 0
   },
   {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
     "name": "public_net_id",
     "property": {
       "description": "",
@@ -857,15 +811,28 @@
     ]
   },
   {
-    "name": "k8s-rb-profile-namespace",
+    "name": "onap_private_net_id",
     "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string",
-      "default": "default"
+      "description": "onap private net id",
+      "type": "string"
     },
     "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "default",
+    "dictionary-name": "onap_private_net_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "onap_private_subnet_id",
+    "property": {
+      "description": "onap private subnet id",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_subnet_id",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -874,7 +841,7 @@
   {
     "name": "int_private1_net_id",
     "property": {
-      "description": "Private unprotected network identification",
+      "description": "private1 net id",
       "type": "string"
     },
     "input-param": false,
@@ -884,5 +851,20 @@
       "service-instance-id",
       "vnf-id"
     ]
+  },
+  {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
   }
 ]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
index a36240dd..27651e4a 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -1,269 +1,224 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "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": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-
-    {
-      "param-name": "vpg_image_name",
-      "param-value": "${vpg_image_name}"
-    },
-    {
-      "param-name": "vpg_flavor_name",
-      "param-value": "${vpg_flavor_name}"
-    },
-	{
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "int_private1_net_cidr",
-      "param-value": "${int_private1_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-    {
-      "param-name": "vfw_int_private1_ip_0",
-      "param-value": "${vfw_int_private1_ip_0}"
-    },
-    {
-      "param-name": "vpg_int_private1_ip_0",
-      "param-value": "${vpg_int_private1_ip_0}"
-    },
-    {
-      "param-name": "vsn_int_private2_ip_0",
-      "param-value": "${vsn_int_private2_ip_0}"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "$(dcae_collector_ip)"
-    },
-    {
-        "param-name": "dcae_collector_port",
-        "param-value": "$(dcae_collector_port)"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}}"
-    },
-	{
-      "param-name": "key_name",
-      "param-value": "${vnf_name}_key_name"
-    },
-	   {
-      "param-name": "cloud_env",
-      "param-value": "$(cloud_env)"
-    },
-	  {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-	{
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-	{
-      "param-name": "vpg_onap_private_ip_0",
-      "param-value": "${vpg_onap_private_ip_0}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },
-    {
-      "param-name": "int_private1_net_id",
-      "param-value": "${int_private1_net_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vpg_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vpg_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vpg_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_name_0",
-              "resource-value": "${vpg_name_0}"
-            }
-          ]
-        },
-        {
-          "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": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "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}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
+    "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_LABEL",
+                            "param-value": "${vf-module-label}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "${vf-module-type}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": "${status}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "vf-module",
+                            "param-value": "vf-module"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
+        },
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
+        {
+            "param-name": "vnf_model_customization_uuid",
+            "param-value": "${vnf-model-customization-uuid}"
+        },
+        {
+            "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": "vf_module_id",
+            "param-value": "${vf-module-id}"
+        },
+        {
+            "param-name": "vf_module_type",
+            "param-value": "${vf-module-type}"
+        },
+        {
+            "param-name": "vf_module_customization_uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+        {
+            "param-name": "vfc_customization_uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "aic-cloud-region",
+            "param-value": "${aic-cloud-region}"
+        },
+        {
+            "param-name": "vnfc-model-customization-uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "vnfc-model-invariant-uuid",
+            "param-value": "${vnfc-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vnfc-model-version",
+            "param-value": "${vnfc-model-version}"
+        },
+        {
+            "param-name": "nfc-naming-code",
+            "param-value": "${nfc-naming-code}"
+        },
+        {
+            "param-name": "vpg_image_name",
+            "param-value": "${vpg_image_name}"
+        },
+        {
+            "param-name": "vpg_flavor_name",
+            "param-value": "${vpg_flavor_name}"
+        },
+        {
+            "param-name": "public_net_id",
+            "param-value": "${public_net_id}"
+        },
+        {
+            "param-name": "int_private1_net_cidr",
+            "param-value": "${int_private1_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_subnet_id",
+            "param-value": "${onap_private_subnet_id}"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "vfw_int_private1_ip_0",
+            "param-value": "${vfw_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vpg_int_private1_ip_0",
+            "param-value": "${vpg_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vsn_int_private2_ip_0",
+            "param-value": "${vsn_int_private2_ip_0}"
+        },
+        {
+            "param-name": "dcae_collector_ip",
+            "param-value": "${dcae_collector_ip}"
+        },
+        {
+            "param-name": "dcae_collector_port",
+            "param-value": "${dcae_collector_port}"
+        },
+        {
+            "param-name": "demo_artifacts_version",
+            "param-value": "${demo_artifacts_version}}"
+        },
+        {
+            "param-name": "install_script_version",
+            "param-value": "${install_script_version}}"
+        },
+        {
+            "param-name": "key_name",
+            "param-value": "${vnf_name}_key_name"
+        },
+        {
+            "param-name": "cloud_env",
+            "param-value": "${cloud_env}"
+        },
+        {
+            "param-name": "sec_group",
+            "param-value": "${sec_group}"
+        },
+        {
+            "param-name": "nexus_artifact_repo",
+            "param-value": "${nexus_artifact_repo}"
+        },
+        {
+            "param-name": "vpg_onap_private_ip_0",
+            "param-value": "${vpg_onap_private_ip_0}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
+        },
+        {
+            "param-name": "onap_private_net_id",
+            "param-value": "${vnf-id}-management-network"
+        },
+        {
+            "param-name": "int_private1_net_id",
+            "param-value": "${vnf-id}-unprotected-network"
+        },
+        {
+            "param-name": "vpg_name_0",
+            "param-value": "vpg-${vf-module-id}"
         }
-      ]
-    }
-  ]
+    ]
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
index 63f9770f..7b85b54e 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -181,29 +181,6 @@
     "version": 0
   },
   {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
     "name": "int_private2_net_cidr",
     "property": {
       "description": "",
@@ -250,29 +227,6 @@
     "version": 0
   },
   {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
     "name": "public_net_id",
     "property": {
       "description": "",
@@ -815,19 +769,5 @@
       "service-instance-id",
       "vnf-id"
     ]
-  },
-  {
-    "name": "int_private2_net_id",
-    "property": {
-      "description": "Private protected network identification",
-      "type": "string"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ]
   }
 ]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index 1336b8e5..a7a61d6b 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -1,279 +1,235 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "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": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-
-    {
-      "param-name": "vsn_image_name",
-      "param-value": "${vsn_image_name}"
-    },
-    {
-      "param-name": "vsn_flavor_name",
-      "param-value": "${vsn_flavor_name}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-
-
-
-    {
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-	    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "vfw_int_private2_ip_0",
-      "param-value": "${vfw_int_private2_ip_0}"
-    },
-	{
-      "param-name": "vsn_int_private2_ip_0",
-      "param-value": "${vsn_int_private2_ip_0}"
-    },
-	{
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}"
-    },
-	  {
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-	{
-      "param-name": "key_name",
-      "param-value": "${vnf_name}_key_name"
-    },
-	 {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-	   {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-	{
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },
-    {
-      "param-name": "int_private2_gw_ip",
-      "param-value": "${int_private2_gw_ip}"
-    },
-    {
-      "param-name": "int_private2_net_id",
-      "param-value": "${int_private2_net_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vsn_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vsn_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vsn_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_name_0",
-              "resource-value": "${vsn_name_0}"
-            }
-          ]
-        },
-        {
-          "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_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vf_module_id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vsn_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_onap_private_ip_0",
-              "resource-value": "${vsn_onap_private_ip_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_LABEL",
+                            "param-value": "${vf-module-label}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "${vf-module-type}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "netbox-ip-assign",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vsn_onap_private_ip_0",
+                            "resource-value": "${vsn_onap_private_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${management-prefix-id}"
+                        },
+                        {
+                            "param-name": "vf_module_id",
+                            "param-value": "${vf-module-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vf-module-id}-vsn_onap_private_ip_0"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": "${status}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "vf-module",
+                            "param-value": "vf-module"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
+        },
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
+        {
+            "param-name": "vnf_model_customization_uuid",
+            "param-value": "${vnf-model-customization-uuid}"
+        },
+        {
+            "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": "vf_module_id",
+            "param-value": "${vf-module-id}"
+        },
+        {
+            "param-name": "vf_module_type",
+            "param-value": "${vf-module-type}"
+        },
+        {
+            "param-name": "vf_module_customization_uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+        {
+            "param-name": "vfc_customization_uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "aic-cloud-region",
+            "param-value": "${aic-cloud-region}"
+        },
+        {
+            "param-name": "vnfc-model-customization-uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "vnfc-model-invariant-uuid",
+            "param-value": "${vnfc-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vnfc-model-version",
+            "param-value": "${vnfc-model-version}"
+        },
+        {
+            "param-name": "nfc-naming-code",
+            "param-value": "${nfc-naming-code}"
+        },
+        {
+            "param-name": "vsn_image_name",
+            "param-value": "${vsn_image_name}"
+        },
+        {
+            "param-name": "vsn_flavor_name",
+            "param-value": "${vsn_flavor_name}"
+        },
+        {
+            "param-name": "public_net_id",
+            "param-value": "${public_net_id}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_net_id",
+            "param-value": "${vnf-id}-management-network"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "vfw_int_private2_ip_0",
+            "param-value": "${vfw_int_private2_ip_0}"
+        },
+        {
+            "param-name": "vsn_int_private2_ip_0",
+            "param-value": "${vsn_int_private2_ip_0}"
+        },
+        {
+            "param-name": "demo_artifacts_version",
+            "param-value": "${demo_artifacts_version}"
+        },
+        {
+            "param-name": "install_script_version",
+            "param-value": "${install_script_version}"
+        },
+        {
+            "param-name": "key_name",
+            "param-value": "${vnf_name}_key_name"
+        },
+        {
+            "param-name": "cloud_env",
+            "param-value": "openstack"
+        },
+        {
+            "param-name": "sec_group",
+            "param-value": "${sec_group}"
+        },
+        {
+            "param-name": "nexus_artifact_repo",
+            "param-value": "${nexus_artifact_repo}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
+        },
+        {
+            "param-name": "int_private2_gw_ip",
+            "param-value": "${int_private2_gw_ip}"
+        },
+        {
+            "param-name": "int_private2_net_id",
+            "param-value": "${vnf-id}-protected-network"
+        },
+        {
+            "param-name": "vsn_name_0",
+            "param-value": "vsn-${vf-module-id}"
         }
-      ]
-    }
-  ]
+    ]
 }