39 files changed, 72 insertions, 174 deletions
diff --git a/heat/vFW_CNF_CDS/templates/.gitignore b/heat/vFW_CNF_CDS/templates/.gitignore
index a6967843..b3b0d6bf 100644
--- a/heat/vFW_CNF_CDS/templates/.gitignore
+++ b/heat/vFW_CNF_CDS/templates/.gitignore
@@ -1,2 +1,2 @@
 csar/
-vfw_k8s_demo.zip
+vfw_k8s_demo.csar
diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 579f7249..244f9232 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -2,8 +2,8 @@
 
 
 all: csar/ helm base
-	cd csar/ && zip -r vfw_k8s_demo.zip .
-	mv csar/vfw_k8s_demo.zip .
+	cd csar/ && zip -r vfw_k8s_demo.csar .
+	mv csar/vfw_k8s_demo.csar .
 
 helm: csar/
 	make -C helm
@@ -17,4 +17,4 @@ csar/:
 
 clean:
 	rm -rf csar/
-	rm -f vfw_k8s_demo.zip
+	rm -f vfw_k8s_demo.csar
diff --git a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
index 6d314d1d..aebb1462 100644
--- a/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
+++ b/heat/vFW_CNF_CDS/templates/base/MANIFEST.json
@@ -3,63 +3,63 @@
     "description": "",
     "data": [
         {
-            "file": "base.yaml",
+            "file": "base_template.yaml",
             "type": "HEAT",
             "isBase": "true",
             "data": [
                 {
-                    "file": "base.env",
+                    "file": "base_template.env",
                     "type": "HEAT_ENV"
                 }
             ]
         },
         {
-            "file": "base_cloudtech_k8s_charts.tgz",
+            "file": "base_template_cloudtech_k8s_charts.tgz",
             "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS"
         },
         {
-            "file": "firewall.yaml",
+            "file": "vfw.yaml",
             "type": "HEAT",
             "isBase": "false",
             "data": [
                 {
-                    "file": "firewall.env",
+                    "file": "vfw.env",
                     "type": "HEAT_ENV"
                 }
             ]
         },
         {
-            "file": "firewall_cloudtech_k8s_charts.tgz",
+            "file": "vfw_cloudtech_k8s_charts.tgz",
             "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS"
         },
         {
-            "file": "packetgen.yaml",
+            "file": "vpkg.yaml",
             "type": "HEAT",
             "isBase": "false",
             "data": [
                 {
-                    "file": "packetgen.env",
+                    "file": "vpkg.env",
                     "type": "HEAT_ENV"
                 }
             ]
         },
         {
-            "file": "packetgen_cloudtech_k8s_charts.tgz",
+            "file": "vpkg_cloudtech_k8s_charts.tgz",
             "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS"
         },
         {
-            "file": "sink.yaml",
+            "file": "vsn.yaml",
             "type": "HEAT",
             "isBase": "false",
             "data": [
                 {
-                    "file": "sink.env",
+                    "file": "vsn.env",
                     "type": "HEAT_ENV"
                 }
             ]
         },
         {
-            "file": "sink_cloudtech_k8s_charts.tgz",
+            "file": "vsn_cloudtech_k8s_charts.tgz",
             "type": "CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACTS"
         }
     ]
diff --git a/heat/vFW_CNF_CDS/templates/base/base.env b/heat/vFW_CNF_CDS/templates/base/base_template.env
index 0a69e08d..0a69e08d 100644
--- a/heat/vFW_CNF_CDS/templates/base/base.env
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.env
diff --git a/heat/vFW_CNF_CDS/templates/base/base.yaml b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
index 7466f032..403b0e4c 100644
--- a/heat/vFW_CNF_CDS/templates/base/base.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/base_template.yaml
@@ -67,3 +67,11 @@ resources:
         get_param: pub_key
       vnf_name:
         get_param: vnf_name
+
+  #SDC won't allow too dummy resource as it has to find `topology_template` TOSCA equivalent in heat templates
+  dummy_base:
+      type: OS::Nova::Server
+      properties:
+          name: test
+          image: test
+          flavor: test
diff --git a/heat/vFW_CNF_CDS/templates/base/firewall.env b/heat/vFW_CNF_CDS/templates/base/vfw.env
index 42dccf9c..42dccf9c 100644
--- a/heat/vFW_CNF_CDS/templates/base/firewall.env
+++ b/heat/vFW_CNF_CDS/templates/base/vfw.env
diff --git a/heat/vFW_CNF_CDS/templates/base/firewall.yaml b/heat/vFW_CNF_CDS/templates/base/vfw.yaml
index c21988db..c21988db 100644
--- a/heat/vFW_CNF_CDS/templates/base/firewall.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/vfw.yaml
diff --git a/heat/vFW_CNF_CDS/templates/base/packetgen.env b/heat/vFW_CNF_CDS/templates/base/vpkg.env
index 23f7817e..23f7817e 100644
--- a/heat/vFW_CNF_CDS/templates/base/packetgen.env
+++ b/heat/vFW_CNF_CDS/templates/base/vpkg.env
diff --git a/heat/vFW_CNF_CDS/templates/base/packetgen.yaml b/heat/vFW_CNF_CDS/templates/base/vpkg.yaml
index 6a23da0a..6a23da0a 100644
--- a/heat/vFW_CNF_CDS/templates/base/packetgen.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/vpkg.yaml
diff --git a/heat/vFW_CNF_CDS/templates/base/sink.env b/heat/vFW_CNF_CDS/templates/base/vsn.env
index a0b2ec9c..a0b2ec9c 100644
--- a/heat/vFW_CNF_CDS/templates/base/sink.env
+++ b/heat/vFW_CNF_CDS/templates/base/vsn.env
diff --git a/heat/vFW_CNF_CDS/templates/base/sink.yaml b/heat/vFW_CNF_CDS/templates/base/vsn.yaml
index de898a96..de898a96 100644
--- a/heat/vFW_CNF_CDS/templates/base/sink.yaml
+++ b/heat/vFW_CNF_CDS/templates/base/vsn.yaml
diff --git a/heat/vFW_CNF_CDS/templates/helm/Makefile b/heat/vFW_CNF_CDS/templates/helm/Makefile
index 12d2d52f..feb92082 100644
--- a/heat/vFW_CNF_CDS/templates/helm/Makefile
+++ b/heat/vFW_CNF_CDS/templates/helm/Makefile
@@ -1,10 +1,9 @@
-vf-modules = base firewall packetgen sink
+vf-modules = base_template vpkg vfw vsn
 .PHONY: build clean $(vf-modules:=-build) $(vf-modules:-clean) $(vf-modules:=-package)
 
 package: $(vf-modules:=-package)
 build: $(vf-modules:=-build)
 clean: $(vf-modules:=-clean)
-	rm -f *_cloudtech_k8s_charts.tgz
 
 $(vf-modules:=-package): %-package: %-build
 	mv $(@:package=)*.tgz $(@:-package=)_cloudtech_k8s_charts.tgz
@@ -14,3 +13,4 @@ $(vf-modules:=-build): %-build: %-clean
 
 $(vf-modules:=-clean):
 	rm -f $(@:-clean=)-*.tgz
+	rm -f $(@:-clean=)_cloudtech_k8s_charts.tgz
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/.helmignore b/heat/vFW_CNF_CDS/templates/helm/base/.helmignore
deleted file mode 100644
index 646736a7..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/base/.helmignore
+++ /dev/null
@@ -1 +0,0 @@
-resources/id_rsa
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa b/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa
deleted file mode 100644
index 4ab7bb35..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA1ozecYX4HaEu0iGuGHcsiSVZe0EnuwGYIOxIK7GKsauMAlXh
-ZsAadnkzsf3QYEmScVJc6gdBg2eyevS5Z55/8tWQmp21lyvZIJi6n+JDuNea/PLm
-41sGtfw/hZ/NonEESBb5kv1A0isqJyfZNrQ6w9HF1C9a+JfPCxD7wK19Pbp7m3gL
-qsagoMewnY7cTpiDbwNOgAml6Ec+uYLVnmcW2dsnqBrTYXwv585oK+f1Ajg5UgIt
-SJNhcPHZ9fDbs8mDMV5GtZIzquJ/QYJg0joGd8NqikT0OhoIdUorb+IlmH6/3T/t
-cpxc71V+Dm88eVCeb4DUukpvhha2KvmwAny/eQIDAQABAoIBAQCOWtGNSXKjVjsW
-ubomCYzHQrzohwaxkhE6ZwxL0XVRBZ3UPt9bqcLlMO4X/2yvNqGwBxIXRdE2Oyu1
-YYNTOVtz6DgWHuZJ85IRisTpKNv+XTA8/X4tBEyjm0cahjmOuqY4nuXhnZ/Q00sY
-x9vb7CHBpAI7E2Cs6S07Dn28DmC2/znYPyp/UMnoQ6/Ba+RXtyvPfe/3pIvlii0i
-TAzSweT/OmVPPVLGPWLoDD0L0+F7h8Sua5B3kryZoZvO6Vg2nlviCo9ae48C+NbF
-b7WMeg863UP16atHZ0XESsqYhA0lPrIh9WJBKCnj+hUimVxvrqyzJl/GTeOaXVeC
-MQlAnFQBAoGBAOyicvykcoJtkYHJuI0Hev2d30nU7S8qB8Lf4v5n/VTAevB25sgA
-+SIaaRFjNILD2/GpTniWTephAohc+tyMWM2OyL34l3CbJBGHQHFNT5cdLueH2K54
-/vkj/1g2r8p96asBroC87in4ozUr1G9N6RL8NB655c//ZpoldZQeIdVZAoGBAOgb
-v5jLb9/6SNtpKamRCcSbLg2hmCs7rkP9RTrOzjgem3Yg9m2+SF0DKbr16MzjAcfA
-iDGs6CnR2NIx53jg5W04SyiU+fPXA/VPBlznF+jcVOO6xxHquaGVEA25EzzuGXQV
-5snCjCcqMrC1TjPcMPTGGl6nmpwKFc5cLDpOt1chAoGBAM5wMkyB0nxCxkwqBVzT
-h9K15dRtc7ZPvpGd7FPxuKo1eYtKz67wWmgMDlli6K6j27+J6rF8vuCYXTNFmnzJ
-27cIt8wzkTplviOkkO3HeoXkqcTHWJttZ1NGuj7lBptrGW1cfDZHnKb1CL0cTaoE
-mC894uJjX0AEGiikQV1EpFORAoGAYFNTuleDQFKgdd442hRFF4DHJgUQH7EO60xq
-tLMqxgN9xRJ88qJraZ5sbRis2orDLGDspKD7YI+kCeeIBpRe4mrgViEtclKjY+S9
-4UROmecGm9Ph1b+x9irklK1gHIM7sP993fGNNJvAmbFEmSUidBLa0rl/4o4U6qU5
-/aC5WcECgYBTN08VCf3yiDq3D9yd1Iyes3+njXwaejsr/VT8fPTHP4K8dzyOAX9Y
-xqhK7hFS5KM/beFuLYmfdSXQvOzayzEKQqzpLURAy5S5Notq3aWdxtl283qUoPNq
-0RMSzBiyXgqYef4qY8jA632SX4jB3EDQ3P3tf45VpYaFomn6mRO76w==
------END RSA PRIVATE KEY-----
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa.pub b/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa.pub
deleted file mode 100644
index a78b36c2..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/base/resources/id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWjN5xhfgdoS7SIa4YdyyJJVl7QSe7AZgg7EgrsYqxq4wCVeFmwBp2eTOx/dBgSZJxUlzqB0GDZ7J69Llnnn/y1ZCanbWXK9kgmLqf4kO415r88ubjWwa1/D+Fn82icQRIFvmS/UDSKyonJ9k2tDrD0cXUL1r4l88LEPvArX09unubeAuqxqCgx7CdjtxOmINvA06ACaXoRz65gtWeZxbZ2yeoGtNhfC/nzmgr5/UCODlSAi1Ik2Fw8dn18NuzyYMxXka1kjOq4n9BgmDSOgZ3w2qKRPQ6Ggh1Sitv4iWYfr/dP+1ynFzvVX4Obzx5UJ5vgNS6Sm+GFrYq+bACfL95 k.banka@localhost
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/templates/pubkey.yaml b/heat/vFW_CNF_CDS/templates/helm/base/templates/pubkey.yaml
deleted file mode 100644
index 648a1793..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/base/templates/pubkey.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: {{ .Values.key_name }}
-type: Opaque
-stringData:
-    authorized_keys: {{ .Values.pub_key }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/Chart.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/Chart.yaml
index d68b46bb..36ce06cb 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/Chart.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart to deploy shared resources for vFirewall
-name: base
+name: base_template
 version: 0.2.0
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/templates/network_attachment_definition.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
index 5cc01caa..eee1f516 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/templates/network_attachment_definition.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/network_attachment_definition.yaml
@@ -2,6 +2,8 @@ apiVersion: k8s.cni.cncf.io/v1
 kind: NetworkAttachmentDefinition
 metadata:
   name: {{ .Values.vnf_name }}-ovn-attachment
+  labels:
+      vnf-name: {{ .Values.vnf_name }}
 spec:
   config: |
     {
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/templates/onap-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
index e7afc35a..6319b134 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/templates/onap-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/onap-private-net.yaml
@@ -2,6 +2,8 @@ apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
   name: {{ .Values.int_private2_net_id }}
+  labels:
+      vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/templates/protected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
index d0c04d9d..c7077e28 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/templates/protected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/protected-private-net.yaml
@@ -2,6 +2,8 @@ apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
   name: {{ .Values.int_private1_net_id }}
+  labels:
+      vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/templates/unprotected-private-net.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
index 96eab476..429574bd 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/templates/unprotected-private-net.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/templates/unprotected-private-net.yaml
@@ -2,6 +2,8 @@ apiVersion: k8s.plugin.opnfv.org/v1alpha1
 kind: Network
 metadata:
   name: {{ .Values.onap_private_net_id }}
+  labels:
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   cniType : ovn4nfv
   ipv4Subnets:
diff --git a/heat/vFW_CNF_CDS/templates/helm/base/values.yaml b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
index 00b990c0..406d6a35 100644
--- a/heat/vFW_CNF_CDS/templates/helm/base/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/base_template/values.yaml
@@ -14,9 +14,5 @@ onap_private_net_cidr: 10.10.0.0/16
 onap_private_gw_ip: 10.10.0.1/16 #No typo here
 onap_private_net_id: onap-private-net
 onap_private_subnet_id: onap-subnet-1
-#public key
-key_name: ssh-pub-key
-pub_key: |
-    ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWjN5xhfgdoS7SIa4YdyyJJVl7QSe7AZgg7EgrsYqxq4wCVeFmwBp2eTOx/dBgSZJxUlzqB0GDZ7J69Llnnn/y1ZCanbWXK9kgmLqf4kO415r88ubjWwa1/D+Fn82icQRIFvmS/UDSKyonJ9k2tDrD0cXUL1r4l88LEPvArX09unubeAuqxqCgx7CdjtxOmINvA06ACaXoRz65gtWeZxbZ2yeoGtNhfC/nzmgr5/UCODlSAi1Ik2Fw8dn18NuzyYMxXka1kjOq4n9BgmDSOgZ3w2qKRPQ6Ggh1Sitv4iWYfr/dP+1ynFzvVX4Obzx5UJ5vgNS6Sm+GFrYq+bACfL95 k.banka@localhost
 #vnf name
 vnf_name: test-vnf
diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/.helmignore b/heat/vFW_CNF_CDS/templates/helm/firewall/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/heat/vFW_CNF_CDS/templates/helm/packetgen/.helmignore b/heat/vFW_CNF_CDS/templates/helm/packetgen/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/.helmignore b/heat/vFW_CNF_CDS/templates/helm/sink/.helmignore
deleted file mode 100644
index 50af0317..00000000
--- a/heat/vFW_CNF_CDS/templates/helm/sink/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/Chart.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/Chart.yaml
index b43068e1..1e3a8cc1 100644
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/Chart.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart to deploy Firewall app for vFirewall
-name: firewall
+name: vfw
 version: 0.2.0
diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
index 2a9c3500..832afde7 100644
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/configmap.yaml
@@ -4,8 +4,9 @@ metadata:
   name: {{ .Values.vfw_name_0 }}-configmap
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_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 }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
index 8de03e18..4aa1861c 100644
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/templates/deployment.yaml
@@ -4,42 +4,36 @@ metadata:
   name: {{ .Values.vfw_name_0 }}
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }}
+    app: {{ .Values.vfw_name_0 }}
     chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vnf_name }}
+      app: {{ .Values.vfw_name_0 }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vnf_name }}
+        app: {{ .Values.vfw_name_0 }}
         release: {{ .Release.Name }}
+        vnf-name: {{ .Values.vnf_name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
-        VirtletSSHKeySource: "secret/{{ .Values.key_name }}"
         VirtletCloudInitUserData: |
-          ssh_pwauth: True #FIXME Remove after troubleshooting
+          ssh_pwauth: True
           users:
           - name: admin
             gecos: User
             primary-group: admin
             groups: users
             sudo: ALL=(ALL) NOPASSWD:ALL
-            # FIXME Remove after troubleshooting
             # Password is "testuser"
             passwd: "$6$rounds=4096$D6cf92nq$cgBveQHTP7IK3CIYTNkVJyzd0Vze6l1QlV9sWSXiTma2hOCTl7bFSh4nvK5qPMvNlnDtlIm03arG5Uh866E9w."
             lock_passwd: False
           runcmd:
-            #FIXME DEBUG START
-            - echo "ENV:"
-            - env
-            - echo "/etc/cloud/environment:"
-            - cat /etc/cloud/environment
-            #FIXME DEBUG END
             - 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
diff --git a/heat/vFW_CNF_CDS/templates/helm/firewall/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
index c7082f05..873842fe 100644
--- a/heat/vFW_CNF_CDS/templates/helm/firewall/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vfw/values.yaml
@@ -39,7 +39,6 @@ resources:
 # Names
 vnf_name: test-vnf
 vfw_name_0: test-vnf-vfw
-key_name: ssh-pub-key
 int_private1_net_id: unprotected-net
 int_private2_net_id: protected-net
 onap_private_net_id: onap-private-net
@@ -48,7 +47,7 @@ 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
-dcae_collector_port: 8081 #FIXME set to 30235?
+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
diff --git a/heat/vFW_CNF_CDS/templates/helm/packetgen/Chart.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/Chart.yaml
index a9cdca1f..92320310 100644
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/Chart.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart to deploy packet generator for vFirewall
-name: packetgen
+name: vpkg
 version: 0.2.0
diff --git a/heat/vFW_CNF_CDS/templates/helm/packetgen/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
index 5dd1a2df..f697d448 100644
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/configmap.yaml
@@ -4,8 +4,9 @@ metadata:
   name: {{ .Values.vpg_name_0 }}-configmap
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_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/packetgen/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
index 0f1ced50..acd39ab6 100644
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/deployment.yaml
@@ -4,33 +4,32 @@ metadata:
   name: {{ .Values.vpg_name_0 }}
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }}
+    app: {{ .Values.vpg_name_0 }}
     chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vnf_name }}
+      app: {{ .Values.vpg_name_0 }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vnf_name }}
+        app: {{ .Values.vpg_name_0 }}
         release: {{ .Release.Name }}
+        vnf-name: {{ .Values.vnf_name }}
       annotations:
         VirtletLibvirtCPUSetting: |
           mode: host-model
-        VirtletSSHKeySource: "secret/{{ .Values.key_name }}"
         VirtletCloudInitUserData: |
-          ssh_pwauth: True #FIXME Remove after troubleshooting
+          ssh_pwauth: True
           users:
-          #- default #FIXME Check working key auth or remove
           - name: admin
             gecos: User
             primary-group: admin
             groups: users
             sudo: ALL=(ALL) NOPASSWD:ALL
-            # FIXME Remove after troubleshooting
             # Password is "testuser"
             passwd: "$6$rounds=4096$D6cf92nq$cgBveQHTP7IK3CIYTNkVJyzd0Vze6l1QlV9sWSXiTma2hOCTl7bFSh4nvK5qPMvNlnDtlIm03arG5Uh866E9w."
             lock_passwd: False
diff --git a/heat/vFW_CNF_CDS/templates/helm/packetgen/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
index 51237692..7f00ba61 100644
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/templates/service.yaml
@@ -1,16 +1,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.vpg_name_0 }}-service"
+  name: "{{ .Values.vpg_name_0 }}-management-api"
   labels:
-    app: {{ .Values.vnf_name }}
+    app: {{ .Values.vpg_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.vnf_name }}
+    app: {{ .Values.vpg_name_0 }}
     release: {{ .Release.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/packetgen/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
index de106fab..a6dc4e1f 100644
--- a/heat/vFW_CNF_CDS/templates/helm/packetgen/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vpkg/values.yaml
@@ -18,7 +18,6 @@ service:
 # Names
 vpg_name_0: test-vnf-vpg
 vnf_name: test-vnf 
-key_name: ssh-pub-key
 int_private1_net_id: unprotected-net
 onap_private_net_id: onap-private-net
 # Own Addresses
@@ -26,7 +25,7 @@ vpg_int_private1_ip_0: 192.168.10.2
 vpg_onap_private_ip_0: 10.10.100.2
 # Env variables
 dcae_collector_ip: 10.0.4.1 #Placeholder
-dcae_collector_port: 8081 #FIXME set to 30235?
+dcae_collector_port: 8080
 demo_artifacts_version: 1.5.0
 vfw_int_private1_ip_0: 192.168.10.3
 vsn_int_private2_ip_0: 192.168.20.3
diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/Chart.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/Chart.yaml
index 2feffe0c..0f2ec087 100644
--- a/heat/vFW_CNF_CDS/templates/helm/sink/Chart.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart to deploy sink for vFirewall
-name: sink
+name: vsn
 version: 0.2.0
diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/templates/configmap.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
index 85fbfc8e..42bd634d 100644
--- a/heat/vFW_CNF_CDS/templates/helm/sink/templates/configmap.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/configmap.yaml
@@ -4,8 +4,9 @@ metadata:
   name: {{ .Values.vsn_name_0 }}-configmap
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_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 }} #FIXME maybe?
+  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/sink/templates/deployment.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
index 578f02f0..4df818e9 100644
--- a/heat/vFW_CNF_CDS/templates/helm/sink/templates/deployment.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/deployment.yaml
@@ -4,19 +4,21 @@ metadata:
   name: {{ .Values.vsn_name_0 }}
   labels:
     release: {{ .Release.Name }}
-    app: {{ .Values.vnf_name }} #FIXME Should vnf_name be replaced with v*_name_0 for labels?
+    app: {{ .Values.vsn_name_0 }}
     chart: {{ .Chart.Name }}
+    vnf-name: {{ .Values.vnf_name }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Values.vnf_name }}
+      app: {{ .Values.vsn_name_0 }}
       release: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app: {{ .Values.vnf_name }}
+        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: |
@@ -33,16 +35,6 @@ spec:
               ]
             }
     spec:
-      #FIXME DEBUG START
-      initContainers:
-      - name: init-test
-        image: busybox
-        command:
-            - env
-        envFrom:
-        - configMapRef:
-            name: {{ .Values.vsn_name_0 }}-configmap
-      #FIXME DEBUG END
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.sinkrepo }}:{{ .Values.image.sinktag }}"
diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/templates/service.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
index 8949e7d1..06708ace 100644
--- a/heat/vFW_CNF_CDS/templates/helm/sink/templates/service.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/templates/service.yaml
@@ -1,16 +1,17 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.vsn_name_0 }}-service"
+  name: "{{ .Values.vsn_name_0 }}-darkstat-ui"
   labels:
-    app: {{ .Values.vnf_name }}
+    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.vnf_name }}
+    app: {{ .Values.vsn_name_0 }}
     release: {{ .Release.Name }}
diff --git a/heat/vFW_CNF_CDS/templates/helm/sink/values.yaml b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml
index 978323ab..978323ab 100644
--- a/heat/vFW_CNF_CDS/templates/helm/sink/values.yaml
+++ b/heat/vFW_CNF_CDS/templates/helm/vsn/values.yaml