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

1 files changed, 109 insertions, 156 deletions

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"
         }
-      ]
-    }
-  ]
+    ]
 }