CDS Blueprint for vFW K8s Use Case

Introduce blueprint changes on top of latest
vFW demo to also support multicloud/K8s plugin
integration.

This commit brings resource resolution part for
k8s related parameters that are enough to instantiate
CNF defined by Helm charts in multicloud/k8s plugin.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I783e364a201cda25ea812d83795ae2a4be71def9

7 files changed, 25 insertions, 25 deletions

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 6319b134..429574bd 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
@@ -1,12 +1,12 @@
 apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
-  name: {{ .Values.int_private2_net_id }}
+  name: {{ .Values.onap_private_net_id }}
   labels:
-      vnf-name: {{ .Values.vnf_name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
-  - name: {{ .Values.int_private2_subnet_id }}
-    subnet: {{ .Values.int_private2_net_cidr }}
-    gateway: {{ .Values.int_private2_gw_ip }}
+  - name: {{ .Values.onap_private_subnet_id }}
+    subnet: {{ .Values.onap_private_net_cidr }}
+    gateway: {{ .Values.onap_private_gw_ip }}
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 c7077e28..f7dbfc46 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
@@ -1,12 +1,12 @@
 apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
-  name: {{ .Values.int_private1_net_id }}
+  name: {{ .Values.int_private2_net_id }}
   labels:
-      vnf-name: {{ .Values.vnf_name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
-  - name: {{ .Values.int_private1_subnet_id }}
-    subnet: {{ .Values.int_private1_net_cidr }}
-    gateway: {{ .Values.int_private1_gw_ip }}
+  - name: {{ .Values.int_private2_subnet_id }}
+    subnet: {{ .Values.int_private2_net_cidr }}
+    gateway: {{ .Values.int_private2_gw_ip }}
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 429574bd..18a383c6 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
@@ -1,12 +1,12 @@
 apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
-  name: {{ .Values.onap_private_net_id }}
+  name: {{ .Values.int_private1_net_id }}
   labels:
     vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
-  - name: {{ .Values.onap_private_subnet_id }}
-    subnet: {{ .Values.onap_private_net_cidr }}
-    gateway: {{ .Values.onap_private_gw_ip }}
+  - name: {{ .Values.int_private1_subnet_id }}
+    subnet: {{ .Values.int_private1_net_cidr }}
+    gateway: {{ .Values.int_private1_gw_ip }}
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 406d6a35..9a371fc8 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
@@ -1,4 +1,4 @@
-# OPENSTACK PARAMETERS
+# Kubernetes PARAMETERS
 #unprotected
 int_private1_net_cidr: 192.168.10.0/24
 int_private1_gw_ip: 192.168.10.1/24 #No typo here
diff --git a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
index 873842fe..c97ec60d 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
@@ -1,19 +1,19 @@
 # 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
@@ -35,7 +35,7 @@ resources:
   limits:
     memory: 4Gi
 
-# OPENSTACK PARAMETERS
+# Kubernetes PARAMETERS
 # Names
 vnf_name: test-vnf
 vfw_name_0: test-vnf-vfw
@@ -47,8 +47,8 @@ vfw_int_private1_ip_0: 192.168.10.3
 vfw_int_private2_ip_0: 192.168.20.2
 vfw_onap_private_ip_0: 10.10.100.3
 # Env variables
+int_private2_net_cidr: 192.168.20.0/24
+vsn_int_private2_ip_0: 192.168.20.3
 dcae_collector_port: 8080
 dcae_collector_ip: 10.0.4.1 #Placeholder
 demo_artifacts_version: 1.5.0
-int_private2_net_cidr: 192.168.20.0/24
-vsn_int_private2_ip_0: 192.168.20.3
diff --git a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
index a6dc4e1f..20f00265 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
@@ -14,10 +14,10 @@ service:
     port: 2831
     nodePort: 30831
 
-# OPENSTACK PARAMETERS
+# Kubernetes PARAMETERS
 # Names
 vpg_name_0: test-vnf-vpg
-vnf_name: test-vnf 
+vnf_name: test-vnf
 int_private1_net_id: unprotected-net
 onap_private_net_id: onap-private-net
 # Own Addresses
diff --git a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
index 978323ab..d82ede4a 100644
--- a/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
@@ -21,7 +21,7 @@ service:
 
 # Static Defaults
 #
-# OPENSTACK PARAMETERS
+# Kubernetes PARAMETERS
 # Names
 vnf_name: test-vnf
 vsn_name_0: test-vnf-vsn