Collapse VNF specific templates into 1

Issue: TEST-55
Change-Id: Ia3db6d7e08ecdcfa7cc90b7f6ce31a8a54499043
Signed-off-by: Jerry Flood <jf9860@att.com>

4 files changed, 2 insertions, 331 deletions

diff --git a/robot/assets/templates/sdnc/dnsscaling_preload.template b/robot/assets/templates/sdnc/dnsscaling_preload.template
deleted file mode 100644
index 278ee80d..00000000
--- a/robot/assets/templates/sdnc/dnsscaling_preload.template
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-    "input": {
-        "vnf-topology-information": {
-            "vnf-topology-identifier": {
-                "service-type": "${service_type}",
-                "vnf-name": "${vf_module_name}",
-                "vnf-type": "${vf_module_type}",
-                "generic-vnf-name": "${generic_vnf_name}",
-                "generic-vnf-type": "${generic_vnf_type}"
-            },
-            "vnf-assignments": {
-                "availability-zones": [],
-                "vnf-networks": [],
-                "vnf-vms": []
-            },
-             "vnf-parameters": [
-                {
-                    "vnf-parameter-name": "repo_url_blob",
-                    "vnf-parameter-value": "${repo_url_blob}"
-                },
-                {
-                    "vnf-parameter-name": "repo_url_artifacts",
-                    "vnf-parameter-value": "${repo_url_artifacts}"
-                },
-                {
-                    "vnf-parameter-name": "demo_artifacts_version",
-                    "vnf-parameter-value": "${demo_artifacts_version}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_id",
-                    "vnf-parameter-value": "${ecomp_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_subnet_id",
-                    "vnf-parameter-value": "${ecomp_private_subnet_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_cidr",
-                    "vnf-parameter-value": "${ecomp_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_net_id",
-                    "vnf-parameter-value": "${vlb_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_ip_0",
-                    "vnf-parameter-value": "${vlb_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_ip_1",
-                    "vnf-parameter-value": "${vlb_private_ip_1}"
-                },
-                 {
-                    "vnf-parameter-name": "vdns_private_ip_0",
-                    "vnf-parameter-value": "${vdns_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vdns_private_ip_1",
-                    "vnf-parameter-value": "${vdns_private_ip_1}"
-                },
-                {
-                    "vnf-parameter-name": "vdns_name_0",
-                    "vnf-parameter-value": "${scaling_vdns_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "dcae_collector_ip",
-                    "vnf-parameter-value": "${dcae_collector_ip}"
-                },
-                {
-                    "vnf-parameter-name": "key_name",
-                    "vnf-parameter-value": "${key_name}"
-                },
-                {
-                    "vnf-parameter-name": "pub_key",
-                    "vnf-parameter-value": "${pub_key}"
-                }
-            ]
-        },
-        "request-information": {
-            "request-id": "robot12",
-            "order-version": "1",
-            "notification-url": "openecomp.org",
-            "order-number": "1",
-            "request-action": "PreloadVNFRequest"
-        },
-        "sdnc-request-header": {
-            "svc-request-id": "robot12",
-            "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-            "svc-action": "reserve"
-        }
-    }    
-}
\ No newline at end of file
diff --git a/robot/assets/templates/sdnc/vvg_preload.template b/robot/assets/templates/sdnc/preload.template
index 83095e9d..b2f4f088 100644
--- a/robot/assets/templates/sdnc/vvg_preload.template
+++ b/robot/assets/templates/sdnc/preload.template
@@ -13,13 +13,8 @@
                 "vnf-networks": [],
                 "vnf-vms": []
             },
-             "vnf-parameters": [
-  				{
-                    "vnf-parameter-name": "nova_instance",
-                    "vnf-parameter-value": "${nova_instance}"
-                }
-            ]
-        },
+             "vnf-parameters": ${vnf_parameters}
+       },
         "request-information": {
             "request-id": "robot12",
             "order-version": "1",
diff --git a/robot/assets/templates/sdnc/vfw_preload.template b/robot/assets/templates/sdnc/vfw_preload.template
deleted file mode 100644
index fbe96ca9..00000000
--- a/robot/assets/templates/sdnc/vfw_preload.template
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "input": {
-        "vnf-topology-information": {
-            "vnf-topology-identifier": {
-                "service-type": "${service_type}",
-                "vnf-name": "${vf_module_name}",
-                "vnf-type": "${vf_module_type}",
-                "generic-vnf-name": "${generic_vnf_name}",
-                "generic-vnf-type": "${generic_vnf_type}"
-            },
-            "vnf-assignments": {
-                "availability-zones": [],
-                "vnf-networks": [],
-                "vnf-vms": []
-            },
-             "vnf-parameters": [
-                {
-                    "vnf-parameter-name": "repo_url_blob",
-                    "vnf-parameter-value": "${repo_url_blob}"
-                },
-                {
-                    "vnf-parameter-name": "repo_url_artifacts",
-                    "vnf-parameter-value": "${repo_url_artifacts}"
-                },
-                {
-                    "vnf-parameter-name": "demo_artifacts_version",
-                    "vnf-parameter-value": "${demo_artifacts_version}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_id",
-                    "vnf-parameter-value": "${ecomp_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_subnet_id",
-                    "vnf-parameter-value": "${ecomp_private_subnet_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_cidr",
-                    "vnf-parameter-value": "${ecomp_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "unprotected_private_net_id",
-                    "vnf-parameter-value": "${unprotected_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "protected_private_net_id",
-                    "vnf-parameter-value": "${protected_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "protected_private_net_cidr",
-                    "vnf-parameter-value": "${protected_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "unprotected_private_net_cidr",
-                    "vnf-parameter-value": "${unprotected_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "vfw_private_ip_0",
-                    "vnf-parameter-value": "${vfw_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vfw_private_ip_1",
-                    "vnf-parameter-value": "${vfw_private_ip_1}"
-                },
-                {
-                    "vnf-parameter-name": "vfw_private_ip_2",
-                    "vnf-parameter-value": "${vfw_private_ip_2}"
-                },
-                {
-                    "vnf-parameter-name": "vpg_private_ip_0",
-                    "vnf-parameter-value": "${vpg_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vpg_private_ip_1",
-                    "vnf-parameter-value": "${vpg_private_ip_1}"
-                },
-                {
-                    "vnf-parameter-name": "vsn_private_ip_0",
-                    "vnf-parameter-value": "${vsn_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vsn_private_ip_1",
-                    "vnf-parameter-value": "${vsn_private_ip_1}"
-                },
-                {
-                    "vnf-parameter-name": "vfw_name_0",
-                    "vnf-parameter-value": "${vfw_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "vpg_name_0",
-                    "vnf-parameter-value": "${vpg_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "vsn_name_0",
-                    "vnf-parameter-value": "${vsn_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "dcae_collector_ip",
-                    "vnf-parameter-value": "${dcae_collector_ip}"
-                },
-                {
-                    "vnf-parameter-name": "dcae_collector_port",
-                    "vnf-parameter-value": "${dcae_collector_port}"
-                },
-                {
-                    "vnf-parameter-name": "key_name",
-                    "vnf-parameter-value": "${key_name}"
-                },
-                {
-                    "vnf-parameter-name": "pub_key",
-                    "vnf-parameter-value": "${pub_key}"
-                }
-            ]
-        },
-        "request-information": {
-            "request-id": "robot12",
-            "order-version": "1",
-            "notification-url": "openecomp.org",
-            "order-number": "1",
-            "request-action": "PreloadVNFRequest"
-        },
-        "sdnc-request-header": {
-            "svc-request-id": "robot12",
-            "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-            "svc-action": "reserve"
-        }
-    }    
-}
\ No newline at end of file
diff --git a/robot/assets/templates/sdnc/vlb_preload.template b/robot/assets/templates/sdnc/vlb_preload.template
deleted file mode 100644
index acc3c9d1..00000000
--- a/robot/assets/templates/sdnc/vlb_preload.template
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "input": {
-        "vnf-topology-information": {
-            "vnf-topology-identifier": {
-                "service-type": "${service_type}",
-                "vnf-name": "${vf_module_name}",
-                "vnf-type": "${vf_module_type}",
-                "generic-vnf-name": "${generic_vnf_name}",
-                "generic-vnf-type": "${generic_vnf_type}"
-            },
-            "vnf-assignments": {
-                "availability-zones": [],
-                "vnf-networks": [],
-                "vnf-vms": []
-            },
-             "vnf-parameters": [
-                {
-                    "vnf-parameter-name": "repo_url_blob",
-                    "vnf-parameter-value": "${repo_url_blob}"
-                },
-                {
-                    "vnf-parameter-name": "repo_url_artifacts",
-                    "vnf-parameter-value": "${repo_url_artifacts}"
-                },
-                {
-                    "vnf-parameter-name": "demo_artifacts_version",
-                    "vnf-parameter-value": "${demo_artifacts_version}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_id",
-                    "vnf-parameter-value": "${ecomp_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_subnet_id",
-                    "vnf-parameter-value": "${ecomp_private_subnet_id}"
-                },
-                {
-                    "vnf-parameter-name": "ecomp_private_net_cidr",
-                    "vnf-parameter-value": "${ecomp_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_net_id",
-                    "vnf-parameter-value": "${vlb_private_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_net_cidr",
-                    "vnf-parameter-value": "${vlb_private_net_cidr}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_ip_0",
-                    "vnf-parameter-value": "${vlb_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_private_ip_1",
-                    "vnf-parameter-value": "${vlb_private_ip_1}"
-                },
-                 {
-                    "vnf-parameter-name": "vdns_private_ip_0",
-                    "vnf-parameter-value": "${vdns_private_ip_0}"
-                },
-                {
-                    "vnf-parameter-name": "vdns_private_ip_1",
-                    "vnf-parameter-value": "${vdns_private_ip_1}"
-                },
-                {
-                    "vnf-parameter-name": "vlb_name_0",
-                    "vnf-parameter-value": "${vlb_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "vdns_name_0",
-                    "vnf-parameter-value": "${vdns_name_0}"
-                },
-                {
-                    "vnf-parameter-name": "dcae_collector_ip",
-                    "vnf-parameter-value": "${dcae_collector_ip}"
-                },
-                {
-                    "vnf-parameter-name": "dcae_collector_port",
-                    "vnf-parameter-value": "${dcae_collector_port}"
-                },
-                {
-                    "vnf-parameter-name": "key_name",
-                    "vnf-parameter-value": "${key_name}"
-                },
-                {
-                    "vnf-parameter-name": "pub_key",
-                    "vnf-parameter-value": "${pub_key}"
-                }
-            ]
-        },
-        "request-information": {
-            "request-id": "robot12",
-            "order-version": "1",
-            "notification-url": "openecomp.org",
-            "order-number": "1",
-            "request-action": "PreloadVNFRequest"
-        },
-        "sdnc-request-header": {
-            "svc-request-id": "robot12",
-            "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-            "svc-action": "reserve"
-        }
-    }    
-}
\ No newline at end of file