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

9 files changed, 20 insertions, 12 deletions

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