Improve CBA to derive variables from others on same level

Previously some variables required to be resolved for each vf-module
individually, by retrieving from MDSAL vnf entry, even though they
didn't differ between each other. Now CBA RA result has been modified to
provide such variables on the same level, by deriving their value from
other variables resolved on the same level (vnf/vf-module) by using sdnc
"unresolved-composite-data" capability.

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

1 files changed, 13 insertions, 16 deletions

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 3b0453d1..55ad7906 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -38,10 +38,6 @@
                         {
                             "param-name": "VF_MODULE_LABEL",
                             "param-value": "${vf-module-label}"
-                        },
-                        {
-                            "param-name": "VF_MODULE_TYPE",
-                            "param-value": "${vf-module-type}"
                         }
                     ]
                 }
@@ -65,6 +61,19 @@
                     ]
                 }
             ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vpg_name_0",
+                            "resource-value": "${vf_module_name}"
+                        }
+                    ]
+                }
+            ]
         }
     ],
     "resource-accumulator-resolved-data": [
@@ -203,18 +212,6 @@
         {
             "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}"
         }
     ]
 }