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

16 files changed, 66 insertions, 92 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
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
index 832afde7..6a38b5a5 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.vfw_name_0 }}-configmap
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vfw_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 data:
   demo_artifacts_version: {{ .Values.demo_artifacts_version | quote }}
   dcae_collector_ip: {{ .Values.dcae_collector_ip | quote }}
@@ -14,4 +14,3 @@ data:
   vfw_private_ip_0: {{ .Values.vfw_int_private1_ip_0 | quote }}
   vsn_private_ip_0: {{ .Values.vsn_int_private2_ip_0 | quote }}
   protected_net_cidr: {{ .Values.int_private2_net_cidr | quote }}
-
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 4aa1861c..2205cf89 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -3,22 +3,23 @@ kind: Deployment
 metadata:
   name: {{ .Values.vfw_name_0 }}
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vfw_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vfw_name_0 }}
-      release: {{ .Release.Name }}
+      vnf-name: {{ .Values.vnf_name }}
+      vf-module-name: {{ .Values.vfw_name_0 }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vfw_name_0 }}
-        release: {{ .Release.Name }}
         vnf-name: {{ .Values.vnf_name }}
+        vf-module-name: {{ .Values.vfw_name_0 }}
+        release: {{ .Release.Name }}
+        chart: {{ .Chart.Name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
@@ -37,7 +38,7 @@ spec:
             - wget -O firewall.sh https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/firewall
             - bash -c 'set -a; . /etc/cloud/environment; bash firewall.sh'
         VirtletRootVolumeSize: 5Gi
-        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+        k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
         k8s.plugin.opnfv.org/nfn-network: | 
             { "type": "ovn4nfv",
               "interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
index c97ec60d..488f61d3 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
@@ -1,30 +1,3 @@
-# global:
-#
-#   #Networks
-#   unprotectedNetworkName: unprotected-private-net
-#   protectedPrivateNetCidr: 192.168.10.0/24
-#   protectedPrivateNetGw: 192.168.10.1/24
-#
-#   onapPrivateNetworkName: onap-private-net
-#   onapPrivateNetCidr: 10.10.0.0/16
-#   onapPrivateNetGw: 10.10.0.1/16
-#
-#   protectedNetworkName: protected-private-net
-#   protectedNetCidr: 192.168.20.0/24
-#   protectedNetGwIp: 192.168.20.100
-#   protectedNetGw: 192.168.20.100/24
-#
-#   #vFirewall container
-#   vfwPrivateIp0: 192.168.10.3
-#   vfwPrivateIp1: 192.168.20.2
-#   vfwPrivateIp2: 10.10.100.3
-#   #Packetgen container
-#   vpgPrivateIp0: 192.168.10.2
-#   vpgPrivateIp1: 10.0.100.2
-#   #Sink container
-#   vsnPrivateIp0: 192.168.20.3
-#   vsnPrivateIp1: 10.10.100.4
-
 # Static Defaults
 replicaCount: 1
 image:
@@ -35,13 +8,13 @@ resources:
   limits:
     memory: 4Gi
 
-# Kubernetes PARAMETERS
 # Names
 vnf_name: test-vnf
 vfw_name_0: test-vnf-vfw
 int_private1_net_id: unprotected-net
 int_private2_net_id: protected-net
 onap_private_net_id: onap-private-net
+net_attachment_definition: vfw-net-attach
 # OWN Addresses
 vfw_int_private1_ip_0: 192.168.10.3
 vfw_int_private2_ip_0: 192.168.20.2
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
index f697d448..c3a2ad4c 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.vpg_name_0 }}-configmap
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vpg_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vpg_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 data:
   vfw_private_ip_0: {{ .Values.vfw_int_private1_ip_0 | quote }}
   vsn_private_ip_0: {{ .Values.vsn_int_private2_ip_0 | quote }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
index acd39ab6..ace04784 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
@@ -3,22 +3,23 @@ kind: Deployment
 metadata:
   name: {{ .Values.vpg_name_0 }}
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vpg_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vpg_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vpg_name_0 }}
-      release: {{ .Release.Name }}
+      vnf-name: {{ .Values.vnf_name }}
+      vf-module-name: {{ .Values.vpg_name_0 }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vpg_name_0 }}
-        release: {{ .Release.Name }}
         vnf-name: {{ .Values.vnf_name }}
+        vf-module-name: {{ .Values.vpg_name_0 }}
+        release: {{ .Release.Name }}
+        chart: {{ .Chart.Name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
@@ -37,7 +38,7 @@ spec:
             - wget -O packetgen.sh https://git.onap.org/multicloud/k8s/plain/kud/tests/vFW/packetgen
             - bash -c 'set -a; . /etc/cloud/environment; bash packetgen.sh'
         VirtletRootVolumeSize: 5Gi
-        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+        k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
         k8s.plugin.opnfv.org/nfn-network: |
             { "type": "ovn4nfv",
               "interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
index 7f00ba61..06b1ad8f 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.vpg_name_0 }}-management-api"
+  name: {{ .Values.vpg_name_0 }}-management-api
   labels:
-    app: {{ .Values.vpg_name_0 }}
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vpg_name_0 }}
     release: {{ .Release.Name }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -15,3 +15,4 @@ spec:
   selector:
     app: {{ .Values.vpg_name_0 }}
     release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
index 20f00265..82c208cb 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
@@ -7,19 +7,18 @@ image:
 resources:
   limits:
     memory: 4Gi
-service:
-#service port value for packetgen service
+service: #service for packetgen management
   type: NodePort
   ports:
     port: 2831
     nodePort: 30831
 
-# Kubernetes PARAMETERS
 # Names
-vpg_name_0: test-vnf-vpg
 vnf_name: test-vnf
+vpg_name_0: test-vnf-vpg
 int_private1_net_id: unprotected-net
 onap_private_net_id: onap-private-net
+net_attachment_definition: vfw-net-attach
 # Own Addresses
 vpg_int_private1_ip_0: 192.168.10.2
 vpg_onap_private_ip_0: 10.10.100.2
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
index 42bd634d..82f8f8b0 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
@@ -3,10 +3,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.vsn_name_0 }}-configmap
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vsn_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vsn_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 data:
-  protected_net_gw: {{ (splitn "/" 2 .Values.int_private2_gw_ip)._0 | quote }}
+  protected_net_gw: {{ .Values.int_private2_gw_ip | quote }}
   protected_private_net_cidr: {{ .Values.int_private1_net_cidr | quote }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
index 4df818e9..6f45ed4a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -3,24 +3,25 @@ kind: Deployment
 metadata:
   name: {{ .Values.vsn_name_0 }}
   labels:
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vsn_name_0 }}
     release: {{ .Release.Name }}
-    app: {{ .Values.vsn_name_0 }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vsn_name_0 }}
-      release: {{ .Release.Name }}
+      vnf-name: {{ .Values.vnf_name }}
+      vf-module-name: {{ .Values.vsn_name_0 }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vsn_name_0 }}
-        release: {{ .Release.Name }}
         vnf-name: {{ .Values.vnf_name }}
+        vf-module-name: {{ .Values.vsn_name_0 }}
+        release: {{ .Release.Name }}
+        chart: {{ .Chart.Name }}
       annotations:
-        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+        k8s.v1.cni.cncf.io/networks: "{{ .Values.net_attachment_definition }}"
         k8s.plugin.opnfv.org/nfn-network: |
             { "type": "ovn4nfv",
               "interface": [
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
index 06708ace..967a160d 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.vsn_name_0 }}-darkstat-ui"
+  name: {{ .Values.vsn_name_0 }}-darkstat-ui
   labels:
-    app: {{ .Values.vsn_name_0 }}
+    vnf-name: {{ .Values.vnf_name }}
+    vf-module-name: {{ .Values.vsn_name_0 }}
     release: {{ .Release.Name }}
     chart: {{ .Chart.Name }}
-    vnf-name: {{ .Values.vnf_name }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -15,3 +15,4 @@ spec:
   selector:
     app: {{ .Values.vsn_name_0 }}
     release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
index d82ede4a..6d12c514 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
@@ -1,36 +1,26 @@
-# Default values for sink.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
+# Static Defaults
 replicaCount: 1
-
 image:
   sinkrepo: rtsood/onap-vfw-demo-sink
   sinktag: 0.2.0
   pullPolicy: IfNotPresent
   darkstatrepo: electrocucaracha/darkstat
   darkstattag: latest
-
-service:
-#serivce port value for sink service
+service: #service for sink darkstat-ui
   type: NodePort
   ports:
     port: 667
     nodePort: 30667
 
-
-# Static Defaults
-#
-# Kubernetes PARAMETERS
 # Names
 vnf_name: test-vnf
 vsn_name_0: test-vnf-vsn
 int_private2_net_id: protected-net
 onap_private_net_id: onap-private-net
-
+net_attachment_definition: vfw-net-attach
 # OWN Addresses
 vsn_int_private2_ip_0: 192.168.20.3
 vsn_onap_private_ip_0: 10.10.100.4
 # Env Variables
-int_private2_gw_ip: 192.168.20.1/24
+int_private2_gw_ip: 192.168.20.1
 int_private1_net_cidr: 192.168.10.0/24