Correct CBA package for vFW_CNF_CDS usecase

This fixes change helm and cba content to enable instantiation
with some workarounds. Data dictionary in this review is not
ready yet, as well as there are many workarounds within.

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

5 files changed, 19 insertions, 11 deletions

diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
index eee1f516..3d7c1360 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
@@ -1,9 +1,11 @@
 apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
-  name: {{ .Values.vnf_name }}-ovn-attachment
+  name: {{ .Values.net_attachment_definition }}
   labels:
-      vnf-name: {{ .Values.vnf_name }}
+    vnf-name: {{ .Values.vnf_name }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
 spec:
   config: |
     {
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
index 429574bd..1b9423f6 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
   name: {{ .Values.onap_private_net_id }}
   labels:
     vnf-name: {{ .Values.vnf_name }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
   - name: {{ .Values.onap_private_subnet_id }}
     subnet: {{ .Values.onap_private_net_cidr }}
-    gateway: {{ .Values.onap_private_gw_ip }}
+    gateway: {{ .Values.onap_private_gw_ip }}/{{ (splitn "/" 2 .Values.onap_private_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
index f7dbfc46..6b939d2a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
   name: {{ .Values.int_private2_net_id }}
   labels:
     vnf-name: {{ .Values.vnf_name }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
   - name: {{ .Values.int_private2_subnet_id }}
     subnet: {{ .Values.int_private2_net_cidr }}
-    gateway: {{ .Values.int_private2_gw_ip }}
+    gateway: {{ .Values.int_private2_gw_ip }}/{{ (splitn "/" 2 .Values.int_private2_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
index 18a383c6..db2a5b32 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
@@ -4,9 +4,11 @@ metadata:
   name: {{ .Values.int_private1_net_id }}
   labels:
     vnf-name: {{ .Values.vnf_name }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
   - name: {{ .Values.int_private1_subnet_id }}
     subnet: {{ .Values.int_private1_net_cidr }}
-    gateway: {{ .Values.int_private1_gw_ip }}
+    gateway: {{ .Values.int_private1_gw_ip }}/{{ (splitn "/" 2 .Values.int_private1_net_cidr)._1 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
index 9a371fc8..8928bedd 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
@@ -1,18 +1,18 @@
-# Kubernetes PARAMETERS
+vnf_name: test-vnf
 #unprotected
 int_private1_net_cidr: 192.168.10.0/24
-int_private1_gw_ip: 192.168.10.1/24 #No typo here
+int_private1_gw_ip: 192.168.10.1
 int_private1_net_id: unprotected-net
 int_private1_subnet_id: unprotected-subnet-1
 #protected
 int_private2_net_cidr: 192.168.20.0/24
-int_private2_gw_ip: 192.168.20.1/24 #No typo here
+int_private2_gw_ip: 192.168.20.1
 int_private2_net_id: protected-net
 int_private2_subnet_id: protected-subnet-1
 #onap mgmt net
 onap_private_net_cidr: 10.10.0.0/16
-onap_private_gw_ip: 10.10.0.1/16 #No typo here
+onap_private_gw_ip: 10.10.0.1
 onap_private_net_id: onap-private-net
 onap_private_subnet_id: onap-subnet-1
-#vnf name
-vnf_name: test-vnf
+#Network attachment
+net_attachment_definition: vfw-net-attach