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, 19 insertions, 27 deletions

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