Simplify CBA by removing unnecessary variables

Change scope:
- demo_artifacts_version - default on vnf level, removed vf-module level
- install_script_version - removed
- *image_name - removed
- public_net_id - removed
- key_name - removed
- pub_key - removed
- *flavor_name - removed
- sec_group - removed
- nfc-naming-code - removed
- cloud_env - removed
- nexus_artifact_repo - removed
- *cidr - removed, where applicable
- *ip - removed, where applicable
- dcae* - moved to vnf level
- aic-cloud-region - removed on vf-module level
- vnf_name - removed on base-template level
- vf-module-type - removed
- vnfc-model-version - removed
- vnfc-model-invariant-uuid - removed
- vfccustomizationuuid - removed
- vf-module-id - removed from template result
- service-instance-id - removed from template result
- vnf_name - removed and vf-module level
- vf-module-model-customization-uuid - removed from template result
- vf-module-model-version - removed from template result
- vf-module-model-invariant-uuid - removed from template result
- vnf-model-customization-uuid - removed at vf-module-level
and few other minor tweaks including updating dataDict and enrichment

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

1 files changed, 3 insertions, 131 deletions

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 414d6865..754ff731 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -81,13 +81,7 @@
                     "output-key-mapping": [
                         {
                             "resource-name": "aai-vf-module-put",
-                            "resource-value": "${status}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "vf-module",
-                            "param-value": "vf-module"
+                            "resource-value": ""
                         }
                     ]
                 }
@@ -108,139 +102,17 @@
         }
     ],
     "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}"
-        },
+##RB name
         {
             "param-name": "vf-module-model-invariant-uuid",
             "param-value": "${vf-module-model-invariant-uuid}"
         },
+##RB version
         {
             "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_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}"
         },