Refactor FIXMEs in vFW_CDS_CNF use case

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

5 files changed, 125 insertions, 0 deletions

diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/Chart.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/Chart.yaml
new file mode 100644
index 00000000..0f2ec087
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart to deploy sink for vFirewall
+name: vsn
+version: 0.2.0
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
new file mode 100644
index 00000000..42bd634d
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.vsn_name_0 }}-configmap
+  labels:
+    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_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
new file mode 100644
index 00000000..4df818e9
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -0,0 +1,55 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.vsn_name_0 }}
+  labels:
+    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 }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.vsn_name_0 }}
+        release: {{ .Release.Name }}
+        vnf-name: {{ .Values.vnf_name }}
+      annotations:
+        k8s.v1.cni.cncf.io/networks: "{{ .Values.vnf_name }}-ovn-attachment"
+        k8s.plugin.opnfv.org/nfn-network: |
+            { "type": "ovn4nfv",
+              "interface": [
+                { "name": {{ .Values.int_private2_net_id | quote }},
+                  "ipAddress": {{ .Values.vsn_int_private2_ip_0 | quote }},
+                  "interface": "eth1",
+                  "defaultGateway": "false" },
+                { "name": {{ .Values.onap_private_net_id | quote }},
+                  "ipAddress": {{ .Values.vsn_onap_private_ip_0 | quote }},
+                  "interface": "eth2" ,
+                  "defaultGateway": "false" }
+              ]
+            }
+    spec:
+      containers:
+      - name: {{ .Chart.Name }}
+        image: "{{ .Values.image.sinkrepo }}:{{ .Values.image.sinktag }}"
+        envFrom:
+        - configMapRef:
+            name: {{ .Values.vsn_name_0 }}-configmap
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        tty: true
+        stdin: true
+        securityContext:
+          privileged: true
+      - name: darkstat
+        image:  "{{ .Values.image.darkstatrepo }}:{{ .Values.image.darkstattag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        tty: true
+        stdin: true
+        ports:
+          - containerPort: {{ .Values.service.ports.port }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
new file mode 100644
index 00000000..06708ace
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: "{{ .Values.vsn_name_0 }}-darkstat-ui"
+  labels:
+    app: {{ .Values.vsn_name_0 }}
+    release: {{ .Release.Name }}
+    chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.ports.port  }}
+      nodePort: {{ .Values.service.ports.nodePort }} 
+  selector:
+    app: {{ .Values.vsn_name_0 }}
+    release: {{ .Release.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
new file mode 100644
index 00000000..978323ab
--- /dev/null
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
@@ -0,0 +1,36 @@
+# Default values for sink.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+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
+  type: NodePort
+  ports:
+    port: 667
+    nodePort: 30667
+
+
+# Static Defaults
+#
+# OPENSTACK 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
+
+# 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_private1_net_cidr: 192.168.10.0/24