From 666c1371b11799b88658b5e2ac3f77f1b01d2231 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Wed, 1 Jan 2020 23:09:26 +0100 Subject: 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 --- .../templates/cba/Templates/base_template-mapping.json | 15 +++++++++++++++ .../templates/cba/Templates/base_template-template.vtl | 4 ++++ heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json | 15 +++++++++++++++ heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl | 4 ++++ heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json | 15 +++++++++++++++ heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl | 4 ++++ .../vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json | 15 +++++++++++++++ .../vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl | 4 ++++ heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json | 15 +++++++++++++++ heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl | 4 ++++ 10 files changed, 95 insertions(+) (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates') 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 @@ -313,6 +313,21 @@ "vnf-id" ] }, + { + "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": { 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 @@ -40,6 +40,10 @@ "param-name": "k8s-rb-profile-name", "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 @@ -877,6 +877,21 @@ "vnf-id" ] }, + { + "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": { 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 @@ -137,6 +137,10 @@ "param-name": "k8s-rb-profile-name", "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 @@ -618,6 +618,21 @@ "dependencies": [ ] }, + { + "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": { 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 @@ -78,6 +78,10 @@ "param-name": "k8s-rb-profile-name", "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 @@ -832,6 +832,21 @@ "vnf-id" ] }, + { + "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": { 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 @@ -138,6 +138,10 @@ "param-name": "k8s-rb-profile-name", "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 @@ -763,6 +763,21 @@ "vnf-id" ] }, + { + "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": { 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 @@ -118,6 +118,10 @@ "param-name": "k8s-rb-profile-name", "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}" -- cgit 1.2.3-korg