Migrate ccdsk/apps to ccsdk/cds

Change-Id: I020a2ccec4e691717f888e8bd2afec91a7c4e987
Issue-ID: CCSDK-1178
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

5 files changed, 0 insertions, 1309 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
deleted file mode 100644
index 271c5073..00000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf-name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "unprotected_private_net_id",
-      "param-value": "${vnf-name}_unprotected"
-    },
-    {
-      "param-name": "unprotected_private_subnet_id",
-      "param-value": "${vnf-name}_unprotected_sub"
-    },
-    {
-      "param-name": "unprotected_private_net_cidr",
-      "param-value": "${unprotected_private_net_cidr}"
-    },
-    {
-      "param-name": "protected_private_net_id",
-      "param-value": "${vnf-name}_protected"
-    },
-    {
-      "param-name": "protected_private_subnet_id",
-      "param-value": "${vnf-name}_protected_sub"
-    },
-    {
-      "param-name": "protected_private_net_cidr",
-      "param-value": "${protected_private_net_cidr}"
-    },
-    {
-      "param-name": "vf_module_name",
-      "param-value": "${vnf-name}_base"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
deleted file mode 100644
index f7947ef8..00000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf-model-customization-uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vnf_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vnf-id}_vnf_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNF"
-            },
-            {
-              "param-name": "AIC_CLOUD_REGION",
-              "param-value": "${aic-cloud-region}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vnf_name",
-              "resource-value": "${vnf_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${protected-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vfw_private_ip_1"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_private_ip_1",
-              "resource-value": "${vfw_private_ip_1}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${unprotected-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vfw_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_private_ip_0",
-              "resource-value": "${vfw_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${unprotected-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vpg_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_private_ip_0",
-              "resource-value": "${vpg_private_ip_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${protected-prefix-id}"
-            },
-            {
-              "param-name": "vnf-id",
-              "param-value": "${vnf-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vnf-id}-vsn_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_private_ip_0",
-              "resource-value": "${vsn_private_ip_0}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "key_name",
-              "resource-value": "${vnf_name}_key"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vnf-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "generic-vnf",
-              "param-value": "generic-vnf"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vnf-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
deleted file mode 100644
index 6864a36f..00000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
+++ /dev/null
@@ -1,338 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf-name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "dcae_collector_port",
-      "param-value": "8080"
-    },
-    {
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "flavor_name",
-      "param-value": "m1.medium"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "10.0.4.1"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "unprotected_private_net_id",
-      "param-value": "${vnf-name}_unprotected"
-    },
-    {
-      "param-name": "protected_private_net_id",
-      "param-value": "${vnf-name}_protected"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "unprotected_private_net_cidr",
-      "param-value": "${unprotected_private_net_cidr}"
-    },
-    {
-      "param-name": "protected_private_net_cidr",
-      "param-value": "${protected_private_net_cidr}"
-    },
-    {
-      "param-name": "unprotected_private_subnet_id",
-      "param-value": "${vnf-name}_unprotected_sub"
-    },
-    {
-      "param-name": "unprotected_private_net_cidr",
-      "param-value": "${unprotected_private_net_cidr}"
-    },
-    {
-      "param-name": "protected_private_subnet_id",
-      "param-value": "${vnf-name}_protected_sub"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vfw_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vfw_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vfw_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_name_0",
-              "resource-value": "${vfw_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vfw_private_ip_2"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_private_ip_2",
-              "resource-value": "${vfw_private_ip_2}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            },
-            {
-              "param-name": "vnfc",
-              "param-value": "vnfc"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "KEY",
-              "resource-value": "${vnf_name}"
-            },
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf_module_name}"
-            },
-            {
-              "resource-name": "vnfc-name",
-              "resource-value": "${vfw_name_0}"
-            },
-            {
-              "resource-name": "ipv4-oam-address",
-              "resource-value": "${vfw_private_ip_2}"
-            },
-            {
-              "resource-name": "ipv4-oam-address-prefix",
-              "resource-value": "${onap_private_net_cidr}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
deleted file mode 100644
index 2ff6596e..00000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
+++ /dev/null
@@ -1,338 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf-name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "dcae_collector_port",
-      "param-value": "8080"
-    },
-    {
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "flavor_name",
-      "param-value": "m1.medium"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "10.0.4.1"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "protected_private_net_id",
-      "param-value": "zdfw1fwl01_protected"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "unprotected_private_net_id",
-      "param-value": "${vnf-name}_unprotected"
-    },
-    {
-      "param-name": "unprotected_private_subnet_id",
-      "param-value": "${vnf-name}_unprotected_sub"
-    },
-    {
-      "param-name": "unprotected_private_net_cidr",
-      "param-value": "${unprotected_private_net_cidr}"
-    },
-    {
-      "param-name": "protected_private_subnet_id",
-      "param-value": "${vnf-name}_protected_sub"
-    },
-    {
-      "param-name": "protected_private_net_id",
-      "param-value": "${vnf-name}_protected"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "vfw_private_ip_0",
-      "param-value": "${vfw_private_ip_0}"
-    },
-    {
-      "param-name": "vsn_private_ip_0",
-      "param-value": "${vsn_private_ip_0}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "vpg_private_ip_0",
-      "param-value": "${vpg_private_ip_0}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vpg_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vpg_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vpg_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_name_0",
-              "resource-value": "${vpg_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vpg_private_ip_1"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vpg_private_ip_1",
-              "resource-value": "${vpg_private_ip_1}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            },
-            {
-              "param-name": "vnfc",
-              "param-value": "vnfc"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf_module_name}"
-            },
-            {
-              "resource-name": "vnfc-name",
-              "resource-value": "${vpg_name_0}"
-            },
-            {
-              "resource-name": "ipv4-oam-address-prefix",
-              "resource-value": "${onap_private_net_cidr}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
deleted file mode 100644
index 11fcea9f..00000000
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
+++ /dev/null
@@ -1,334 +0,0 @@
-{
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-    {
-      "param-name": "vnf_id",
-      "param-value": "${vnf-id}"
-    },
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf-name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vm-type",
-      "param-value": "${vm-type}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-function",
-      "param-value": "${nf-role}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "openstack"
-    },
-    {
-      "param-name": "repo_url_artifacts",
-      "param-value": "https://nexus.onap.org/content/groups/staging"
-    },
-    {
-      "param-name": "repo_url_blob",
-      "param-value": "https://nexus.onap.org/content/repositories/raw"
-    },
-    {
-      "param-name": "dcae_collector_port",
-      "param-value": "8080"
-    },
-    {
-      "param-name": "image_name",
-      "param-value": "${image_name}"
-    },
-    {
-      "param-name": "flavor_name",
-      "param-value": "m1.medium"
-    },
-    {
-      "param-name": "install_script_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${key_name}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-    {
-      "param-name": "demo_artifacts_version",
-      "param-value": "1.2.1-SNAPSHOT"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "10.0.4.1"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "unprotected_private_net_id",
-      "param-value": "${vnf-name}_unprotected"
-    },
-    {
-      "param-name": "protected_private_subnet_id",
-      "param-value": "${vnf-name}_protected_sub"
-    },
-    {
-      "param-name": "protected_private_net_id",
-      "param-value": "${vnf-name}_protected"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-    {
-      "param-name": "unprotected_private_net_cidr",
-      "param-value": "${unprotected_private_net_cidr}"
-    },
-    {
-      "param-name": "protected_private_net_cidr",
-      "param-value": "${protected_private_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-    {
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-    {
-      "param-name": "vfw_private_ip_1",
-      "param-value": "${vfw_private_ip_1}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vsn_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vsn_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vsn_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_name_0",
-              "resource-value": "${vsn_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf_module_name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf_module_name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf_module_name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "nf-role",
-              "param-value": "${nf-role}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf-name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf_module_name",
-              "resource-value": "${vf_module_name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${private-prefix-id}"
-            },
-            {
-              "param-name": "vf-module-id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vsn_private_ip_1"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vsn_private_ip_1",
-              "resource-value": "${vsn_private_ip_1}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            },
-            {
-              "param-name": "vnfc",
-              "param-value": "vnfc"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "unresolved-composite-data",
-      "key-mapping": [
-        {
-          "output-key-mapping": [
-            {
-              "resource-name": "volume-group-name",
-              "resource-value": "${volume_group_name}"
-            },
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf_module_name}"
-            },
-            {
-              "resource-name": "vnfc-name",
-              "resource-value": "${vsn_name_0}"
-            },
-            {
-              "resource-name": "ipv4-oam-address",
-              "resource-value": "${vsn_private_ip_1}"
-            },
-            {
-              "resource-name": "ipv4-oam-address-prefix",
-              "resource-value": "${onap_private_net_cidr}"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file