K8s Profile Upload

Modification of vFW CNF CBA package to upload
K8s profile automatically just after resource
assigment phase. Profile is created for each vf-module
and in this version only upload of static profile is
possible. Profile files must be included in the CBA in
Templates/k8s-profiles folder. Profile file must be valid
tar.gz file accepted by multicloud-k8s plugin.

Change-Id: I30c268e9867fbb86d997b2091ce2eed204a7df2a
Issue-ID: INT-1406
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>

10 files changed, 95 insertions, 0 deletions

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
index b4cadd3f..615bbaef 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
@@ -314,6 +314,21 @@
     ]
   },
   {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private1_gw_ip",
     "property": {
       "description": "Private unprotected network gateway ip",
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 226f4a52..d5ee7202 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
@@ -41,6 +41,10 @@
       "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}"
     },
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
index c78d34c9..9775a800 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
@@ -878,6 +878,21 @@
     ]
   },
   {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private1_net_id",
     "property": {
       "description": "Private unprotected network identification",
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 d81d961d..8b8d19af 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -138,6 +138,10 @@
       "param-value": "${k8s-rb-profile-name}"
     },
     {
+      "param-name": "k8s-rb-profile-namespace",
+      "param-value": "${k8s-rb-profile-namespace}"
+    },    
+    {
       "param-name": "int_private1_net_id",
       "param-value": "${int_private1_net_id}"
     },
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
index 1a1ca278..a1d41199 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -619,6 +619,21 @@
     ]
   },
   {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private1_gw_ip",
     "property": {
       "description": "Private unprotected network gateway ip",
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 37b4b941..617f0b97 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -79,6 +79,10 @@
       "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}"
     },
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
index 801d3398..40f60c02 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -833,6 +833,21 @@
     ]
   },
   {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private1_net_id",
     "property": {
       "description": "Private unprotected network identification",
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 bec8cfb0..1de5c827 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -139,6 +139,10 @@
       "param-value": "${k8s-rb-profile-name}"
     },
     {
+      "param-name": "k8s-rb-profile-namespace",
+      "param-value": "${k8s-rb-profile-namespace}"
+    },    
+    {
       "param-name": "int_private1_net_id",
       "param-value": "${int_private1_net_id}"
     }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
index a4b74507..533ad9a6 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -764,6 +764,21 @@
     ]
   },
   {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
     "name": "int_private2_gw_ip",
     "property": {
       "description": "Private protected network gateway ip",
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index 60b8ecd2..0d368e29 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -119,6 +119,10 @@
       "param-value": "${k8s-rb-profile-name}"
     },
     {
+      "param-name": "k8s-rb-profile-namespace",
+      "param-value": "${k8s-rb-profile-namespace}"
+    },    
+    {
       "param-name": "int_private2_gw_ip",
       "param-value": "${int_private2_gw_ip}"
     },