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

4 files changed, 17 insertions, 16 deletions

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