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, 47 insertions, 11 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 c2e92ade..226f4a52 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
@@ -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}"
@@ -24,22 +21,61 @@
       "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": "pub_key",
+      "param-value": "${pub_key}"
+    },
+    {
+      "param-name": "k8s-rb-profile-name",
+      "param-value": "${k8s-rb-profile-name}"
+    },
+    {
+      "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": [
     {
@@ -109,4 +145,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}