CDS Blueprint for vFW K8s Use Case

Introduce blueprint changes on top of latest
vFW demo to also support multicloud/K8s plugin
integration.

This commit brings resource resolution part for
k8s related parameters that are enough to instantiate
CNF defined by Helm charts in multicloud/k8s plugin.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I783e364a201cda25ea812d83795ae2a4be71def9

1 files changed, 20 insertions, 9 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 ecbbf554..bec8cfb0 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -4,10 +4,7 @@
       "param-name": "service-instance-id",
       "param-value": "${service-instance-id}"
     },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
+
     {
       "param-name": "vnf_name",
       "param-value": "${vnf_name}"
@@ -56,7 +53,7 @@
       "param-name": "nfc-naming-code",
       "param-value": "${nfc-naming-code}"
     },
- 
+
     {
       "param-name": "vpg_image_name",
       "param-value": "${vpg_image_name}"
@@ -102,6 +99,14 @@
       "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}}"
     },
@@ -128,9 +133,15 @@
 	{
       "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": "int_private1_net_id",
+      "param-value": "${int_private1_net_id}"
     }
-	
-	
   ],
   "capability-data": [
     {
@@ -222,7 +233,7 @@
         }
       ]
     },
-    
+
     {
       "capability-name": "aai-vf-module-put",
       "key-mapping": [
@@ -243,4 +254,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}