Fix JSON files linter issues in test/vcpe

This is needed prior to adding job for JSON
files linting in CI.

Change-Id: I408107e0dc58648f833b8d585acf0e414882c7dc
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Issue-ID: INT-1451

diff --git a/test/vcpe/preload_templates/template.network.json b/test/vcpe/preload_templates/template.network.json
index 2acb9e3..e544ba7 100644 (file)
--- a/test/vcpe/preload_templates/template.network.json
+++ b/test/vcpe/preload_templates/template.network.json
@@ -31,7 +31,7 @@
           "VNF-API:dhcp-enabled": "N",
           "VNF-API:gateway-address": "${subnet_gateway}"
         }
-       ]
+      ]
     },
     "VNF-API:sdnc-request-header": {
       "VNF-API:svc-action": "reserve",

diff --git a/test/vcpe/preload_templates/template.networkgra.json b/test/vcpe/preload_templates/template.networkgra.json
index 47c6b6e..45e8d0e 100644 (file)
--- a/test/vcpe/preload_templates/template.networkgra.json
+++ b/test/vcpe/preload_templates/template.networkgra.json
@@ -1,9 +1,9 @@
 {
   "input": {
-     "sdnc-request-header": {
-                       "svc-request-id": "robotgra-1234",
-                       "svc-action": "reserve"
-     },
+    "sdnc-request-header": {
+      "svc-request-id": "robotgra-1234",
+      "svc-action": "reserve"
+    },
     "preload-network-topology-information": {
       "network-topology-identifier-structure": {
         "network-name": "${network_name}",
@@ -18,7 +18,7 @@
           "ip-version": "4",
           "dhcp-enabled": "N",
           "gateway-address": "${subnet_gateway}",
-         "subnet-name": "${network_name}"
+          "subnet-name": "${network_name}"
         }
       ],
       "physical-network-name": "Not Aplicable",

diff --git a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json
index 2792cfd..a0f14a3 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_bng_vfmodule.json
@@ -1,172 +1,170 @@
 {
-   "VNF-API:input": {
-     "VNF-API:request-information": {
-       "VNF-API:request-id": "robot12",
-       "VNF-API:notification-url": "https://so.onap.org",
-       "VNF-API:order-number": "robot12",
-       "VNF-API:request-sub-action": "SUPP",
-       "VNF-API:request-action": "PreloadVNFRequest",
-       "VNF-API:source": "VID",
-       "VNF-API:order-version": "1.0"
-     },
-     "VNF-API:sdnc-request-header": {
-       "VNF-API:svc-action": "reserve",
-       "VNF-API:svc-notification-url": "https://son.onap.org",
-       "VNF-API:svc-request-id": "robot12"
-     },
-     "VNF-API:vnf-topology-information": {
-             "vnf-topology-identifier": {
-               "service-type": "${service_type}",
-               "vnf-type": "${vnf_type}",
-               "generic-vnf-name": "${generic_vnf_name}",
-               "generic-vnf-type": "${generic_vnf_type}",
-               "vnf-name": "${vnf_name}"
-       },
-       "VNF-API:vnf-parameters": [
-               {
-               "vnf-parameter-name": "vcpe_image_name",
-               "vnf-parameter-value": "vbng-casa-base-ubuntu-16-04"
-               },
-               {
-               "vnf-parameter-name": "vcpe_flavor_name",
-               "vnf-parameter-value": "m1.medium"
-               },
-               {
-               "vnf-parameter-name": "public_net_id",
-               "vnf-parameter-value": "${public_net_id}"
-               },
-               {
-               "vnf-parameter-name": "brgemu_bng_private_net_id",
-               "vnf-parameter-value": "${brg_bng_net}"
-               },
-               {
-               "vnf-parameter-name": "brgemu_bng_private_subnet_id",
-               "vnf-parameter-value": "${brg_bng_subnet}"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_net_id",
-               "vnf-parameter-value": "${bng_mux_net}"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_subnet_id",
-               "vnf-parameter-value": "${bng_mux_subnet}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_net_id",
-               "vnf-parameter-value": "${oam_onap_net}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_subnet_id",
-               "vnf-parameter-value": "${oam_onap_subnet}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_net_cidr",
-               "vnf-parameter-value": "10.0.0.0/16"
-               },
-               {
-               "vnf-parameter-name": "cpe_signal_net_id",
-               "vnf-parameter-value": "${cpe_signal_net}"
-               },
-               {
-               "vnf-parameter-name": "cpe_signal_subnet_id",
-               "vnf-parameter-value": "${cpe_signal_subnet}"
-               },
-               {
-               "vnf-parameter-name": "brgemu_bng_private_net_cidr",
-               "vnf-parameter-value": "10.3.0.0/24"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_net_cidr",
-               "vnf-parameter-value": "10.1.0.0/24"
-               },
-               {
-               "vnf-parameter-name": "cpe_signal_private_net_cidr",
-               "vnf-parameter-value": "10.4.0.0/24"
-               },
-               {
-               "vnf-parameter-name": "sdnc_ip_addr",
-               "vnf-parameter-value": "${sdnc_oam_ip}"
-               },
-               {
-               "vnf-parameter-name": "vbng_private_ip_0",
-               "vnf-parameter-value": "10.3.0.1"
-               },
-               {
-               "vnf-parameter-name": "vbng_private_ip_1",
-               "vnf-parameter-value": "10.0.101.10"
-               },
-               {
-               "vnf-parameter-name": "vbng_private_ip_2",
-               "vnf-parameter-value": "10.4.0.3"
-               },
-               {
-               "vnf-parameter-name": "vbng_private_ip_3",
-               "vnf-parameter-value": "10.1.0.10"
-               },
-               {
-               "vnf-parameter-name": "vbng_name_0",
-               "vnf-parameter-value": "zdcpe1cpe01bng01_${suffix}"
-               },
-               {
-               "vnf-parameter-name": "vnf_id",
-               "vnf-parameter-value": "vCPE_Infrastructure_Metro_vBNG_demo_app"
-               },
-               {
-               "vnf-parameter-name": "vf_module_id",
-               "vnf-parameter-value": "vCPE_Intrastructure_Metro_vBNG"
-               },
-               {
-               "vnf-parameter-name": "dcae_collector_ip",
-               "vnf-parameter-value": "10.0.4.102"
-               },
-               {
-               "vnf-parameter-name": "dcae_collector_port",
-               "vnf-parameter-value": "8080"
-               },
-               {
-               "vnf-parameter-name": "repo_url_blob",
-               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
-               },
-               {
-               "vnf-parameter-name": "repo_url_artifacts",
-               "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
-               },
-               {
-               "vnf-parameter-name": "demo_artifacts_version",
-               "vnf-parameter-value": "1.1.1"
-               },
-               {
-               "vnf-parameter-name": "script_version",
-               "vnf-parameter-value": "1.3.0"
-               },
-               {
-               "vnf-parameter-name": "key_name",
-               "vnf-parameter-value": "vbng_key"
-               },
-               {
-               "vnf-parameter-name": "pub_key",
-               "vnf-parameter-value": "${pub_key}"
-               },
-               {
-               "vnf-parameter-name": "cloud_env",
-               "vnf-parameter-value": "openstack"
-               },
-               {
-               "vnf-parameter-name": "vpp_source_repo_url",
-               "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
-               },
-               {
-               "vnf-parameter-name": "vpp_source_repo_branch",
-               "vnf-parameter-value": "stable/1704"
-               },
-               {
-               "vnf-parameter-name": "vpp_patch_url",
-               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch"
-               }
-       ],
-       "VNF-API:vnf-assignments": {
-         }
-       }
-     }
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:request-id": "robot12",
+      "VNF-API:notification-url": "https://so.onap.org",
+      "VNF-API:order-number": "robot12",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:request-action": "PreloadVNFRequest",
+      "VNF-API:source": "VID",
+      "VNF-API:order-version": "1.0"
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "https://son.onap.org",
+      "VNF-API:svc-request-id": "robot12"
+    },
+    "VNF-API:vnf-topology-information": {
+      "vnf-topology-identifier": {
+        "service-type": "${service_type}",
+        "vnf-type": "${vnf_type}",
+        "generic-vnf-name": "${generic_vnf_name}",
+        "generic-vnf-type": "${generic_vnf_type}",
+        "vnf-name": "${vnf_name}"
+      },
+      "VNF-API:vnf-parameters": [
+        {
+          "vnf-parameter-name": "vcpe_image_name",
+          "vnf-parameter-value": "vbng-casa-base-ubuntu-16-04"
+        },
+        {
+          "vnf-parameter-name": "vcpe_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "brgemu_bng_private_net_id",
+          "vnf-parameter-value": "${brg_bng_net}"
+        },
+        {
+          "vnf-parameter-name": "brgemu_bng_private_subnet_id",
+          "vnf-parameter-value": "${brg_bng_subnet}"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_net_id",
+          "vnf-parameter-value": "${bng_mux_net}"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_subnet_id",
+          "vnf-parameter-value": "${bng_mux_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${oam_onap_net}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${oam_onap_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_net_id",
+          "vnf-parameter-value": "${cpe_signal_net}"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_subnet_id",
+          "vnf-parameter-value": "${cpe_signal_subnet}"
+        },
+        {
+          "vnf-parameter-name": "brgemu_bng_private_net_cidr",
+          "vnf-parameter-value": "10.3.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_net_cidr",
+          "vnf-parameter-value": "10.1.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_private_net_cidr",
+          "vnf-parameter-value": "10.4.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "sdnc_ip_addr",
+          "vnf-parameter-value": "${sdnc_oam_ip}"
+        },
+        {
+          "vnf-parameter-name": "vbng_private_ip_0",
+          "vnf-parameter-value": "10.3.0.1"
+        },
+        {
+          "vnf-parameter-name": "vbng_private_ip_1",
+          "vnf-parameter-value": "10.0.101.10"
+        },
+        {
+          "vnf-parameter-name": "vbng_private_ip_2",
+          "vnf-parameter-value": "10.4.0.3"
+        },
+        {
+          "vnf-parameter-name": "vbng_private_ip_3",
+          "vnf-parameter-value": "10.1.0.10"
+        },
+        {
+          "vnf-parameter-name": "vbng_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01bng01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vnf_id",
+          "vnf-parameter-value": "vCPE_Infrastructure_Metro_vBNG_demo_app"
+        },
+        {
+          "vnf-parameter-name": "vf_module_id",
+          "vnf-parameter-value": "vCPE_Intrastructure_Metro_vBNG"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_ip",
+          "vnf-parameter-value": "10.0.4.102"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_port",
+          "vnf-parameter-value": "8080"
+        },
+        {
+          "vnf-parameter-name": "repo_url_blob",
+          "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+        },
+        {
+          "vnf-parameter-name": "repo_url_artifacts",
+          "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
+        },
+        {
+          "vnf-parameter-name": "demo_artifacts_version",
+          "vnf-parameter-value": "1.1.1"
+        },
+        {
+          "vnf-parameter-name": "script_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "key_name",
+          "vnf-parameter-value": "vbng_key"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_url",
+          "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_branch",
+          "vnf-parameter-value": "stable/1704"
+        },
+        {
+          "vnf-parameter-name": "vpp_patch_url",
+          "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch"
+        }
+      ],
+      "VNF-API:vnf-assignments": {}
+    }
+  }
 }
-

diff --git a/test/vcpe/preload_templates/template.vcpe_bnggra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_bnggra_vfmodule.json
index 544d8e1..ee804c4 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_bnggra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_bnggra_vfmodule.json
@@ -1,173 +1,174 @@
 {
-       "GENERIC-RESOURCE-API:input": {
-               "GENERIC-RESOURCE-API:request-information": {
-                       "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
-                       "GENERIC-RESOURCE-API:order-number": "robot12",
-                       "GENERIC-RESOURCE-API:order-version": "1.0",
-                       "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
-                       "GENERIC-RESOURCE-API:request-id": "robot12",
-                       "GENERIC-RESOURCE-API:source": "VID"
-               },
-               "GENERIC-RESOURCE-API:sdnc-request-header": {
-                       "GENERIC-RESOURCE-API:svc-action": "reserve",
-                       "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
-                       "GENERIC-RESOURCE-API:svc-request-id": "robot12"
-               },
-               "preload-vf-module-topology-information": {
-                       "vf-module-topology": {
-                               "vf-module-parameters":  {
-                                       "param": [
-                                               {
-                                               "name": "vcpe_image_name",
-                                               "value": "vbng-casa-base-ubuntu-16-04"
-                                               },
-                                               {
-                                               "name": "vcpe_flavor_name",
-                                               "value": "m1.medium"
-                                               },
-                                               {
-                                               "name": "public_net_id",
-                                               "value": "${public_net_id}"
-                                               },
-                                               {
-                                               "name": "brgemu_bng_private_net_id",
-                                               "value": "${brg_bng_net}"
-                                               },
-                                               {
-                                               "name": "brgemu_bng_private_subnet_id",
-                                               "value": "${brg_bng_subnet}"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_net_id",
-                                               "value": "${bng_mux_net}"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_subnet_id",
-                                               "value": "${bng_mux_subnet}"
-                                               },
-                                               {
-                                               "name": "onap_private_net_id",
-                                               "value": "${oam_onap_net}"
-                                               },
-                                               {
-                                               "name": "onap_private_subnet_id",
-                                               "value": "${oam_onap_subnet}"
-                                               },
-                                               {
-                                               "name": "onap_private_net_cidr",
-                                               "value": "10.0.0.0/16"
-                                               },
-                                               {
-                                               "name": "cpe_signal_net_id",
-                                               "value": "${cpe_signal_net}"
-                                               },
-                                               {
-                                               "name": "cpe_signal_subnet_id",
-                                               "value": "${cpe_signal_subnet}"
-                                               },
-                                               {
-                                               "name": "brgemu_bng_private_net_cidr",
-                                               "value": "10.3.0.0/24"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_net_cidr",
-                                               "value": "10.1.0.0/24"
-                                               },
-                                               {
-                                               "name": "cpe_signal_private_net_cidr",
-                                               "value": "10.4.0.0/24"
-                                               },
-                                               {
-                                               "name": "sdnc_ip_addr",
-                                               "value": "${sdnc_oam_ip}"
-                                               },
-                                               {
-                                               "name": "vbng_private_ip_0",
-                                               "value": "10.3.0.1"
-                                               },
-                                               {
-                                               "name": "vbng_private_ip_1",
-                                               "value": "10.0.101.10"
-                                               },
-                                               {
-                                               "name": "vbng_private_ip_2",
-                                               "value": "10.4.0.3"
-                                               },
-                                               {
-                                               "name": "vbng_private_ip_3",
-                                               "value": "10.1.0.10"
-                                               },
-                                               {
-                                               "name": "vbng_name_0",
-                                               "value": "zdcpe1cpe01bng01_${suffix}"
-                                               },
-                                               {
-                                               "name": "vnf_id",
-                                               "value": "vCPE_Infrastructure_Metro_vBNG_demo_app"
-                                               },
-                                               {
-                                               "name": "vf_module_id",
-                                               "value": "vCPE_Intrastructure_Metro_vBNG"
-                                               },
-                                               {
-                                               "name": "dcae_collector_ip",
-                                               "value": "10.0.4.102"
-                                               },
-                                               {
-                                               "name": "dcae_collector_port",
-                                               "value": "8080"
-                                               },
-                                               {
-                                               "name": "repo_url_blob",
-                                               "value": "https://nexus.onap.org/content/sites/raw"
-                                               },
-                                               {
-                                               "name": "repo_url_artifacts",
-                                               "value": "https://nexus.onap.org/content/repositories/releases"
-                                               },
-                                               {
-                                               "name": "demo_artifacts_version",
-                                               "value": "1.1.1"
-                                               },
-                                               {
-                                               "name": "script_version",
-                                               "value": "1.3.0"
-                                               },
-                                               {
-                                               "name": "key_name",
-                                               "value": "vbng_key"
-                                               },
-                                               {
-                                               "name": "pub_key",
-                                               "value": "${pub_key}"
-                                               },
-                                               {
-                                               "name": "cloud_env",
-                                               "value": "openstack"
-                                               },
-                                               {
-                                               "name": "vpp_source_repo_url",
-                                               "value": "https://gerrit.fd.io/r/vpp"
-                                               },
-                                               {
-                                               "name": "vpp_source_repo_branch",
-                                               "value": "stable/1704"
-                                               },
-                                               {
-                                               "name": "vpp_patch_url",
-                                               "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch"
-                                               }
-                               ] },
-                               "vf-module-assignments":  {},
-                                "vf-module-topology-identifier": {
-                                        "vf-module-name": "${vnf_name}"
-                                }
-                       },
-                       "vnf-resource-assignments": {},
-                       "vnf-topology-identifier-structure": {
-                                       "nf-type": "${vnf_type}",
-                                       "vnf-id": "${vnf_name}"
-                       }
+  "GENERIC-RESOURCE-API:input": {
+    "GENERIC-RESOURCE-API:request-information": {
+      "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
+      "GENERIC-RESOURCE-API:order-number": "robot12",
+      "GENERIC-RESOURCE-API:order-version": "1.0",
+      "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
+      "GENERIC-RESOURCE-API:request-id": "robot12",
+      "GENERIC-RESOURCE-API:source": "VID"
+    },
+    "GENERIC-RESOURCE-API:sdnc-request-header": {
+      "GENERIC-RESOURCE-API:svc-action": "reserve",
+      "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
+      "GENERIC-RESOURCE-API:svc-request-id": "robot12"
+    },
+    "preload-vf-module-topology-information": {
+      "vf-module-topology": {
+        "vf-module-parameters": {
+          "param": [
+            {
+              "name": "vcpe_image_name",
+              "value": "vbng-casa-base-ubuntu-16-04"
+            },
+            {
+              "name": "vcpe_flavor_name",
+              "value": "m1.medium"
+            },
+            {
+              "name": "public_net_id",
+              "value": "${public_net_id}"
+            },
+            {
+              "name": "brgemu_bng_private_net_id",
+              "value": "${brg_bng_net}"
+            },
+            {
+              "name": "brgemu_bng_private_subnet_id",
+              "value": "${brg_bng_subnet}"
+            },
+            {
+              "name": "bng_gmux_private_net_id",
+              "value": "${bng_mux_net}"
+            },
+            {
+              "name": "bng_gmux_private_subnet_id",
+              "value": "${bng_mux_subnet}"
+            },
+            {
+              "name": "onap_private_net_id",
+              "value": "${oam_onap_net}"
+            },
+            {
+              "name": "onap_private_subnet_id",
+              "value": "${oam_onap_subnet}"
+            },
+            {
+              "name": "onap_private_net_cidr",
+              "value": "10.0.0.0/16"
+            },
+            {
+              "name": "cpe_signal_net_id",
+              "value": "${cpe_signal_net}"
+            },
+            {
+              "name": "cpe_signal_subnet_id",
+              "value": "${cpe_signal_subnet}"
+            },
+            {
+              "name": "brgemu_bng_private_net_cidr",
+              "value": "10.3.0.0/24"
+            },
+            {
+              "name": "bng_gmux_private_net_cidr",
+              "value": "10.1.0.0/24"
+            },
+            {
+              "name": "cpe_signal_private_net_cidr",
+              "value": "10.4.0.0/24"
+            },
+            {
+              "name": "sdnc_ip_addr",
+              "value": "${sdnc_oam_ip}"
+            },
+            {
+              "name": "vbng_private_ip_0",
+              "value": "10.3.0.1"
+            },
+            {
+              "name": "vbng_private_ip_1",
+              "value": "10.0.101.10"
+            },
+            {
+              "name": "vbng_private_ip_2",
+              "value": "10.4.0.3"
+            },
+            {
+              "name": "vbng_private_ip_3",
+              "value": "10.1.0.10"
+            },
+            {
+              "name": "vbng_name_0",
+              "value": "zdcpe1cpe01bng01_${suffix}"
+            },
+            {
+              "name": "vnf_id",
+              "value": "vCPE_Infrastructure_Metro_vBNG_demo_app"
+            },
+            {
+              "name": "vf_module_id",
+              "value": "vCPE_Intrastructure_Metro_vBNG"
+            },
+            {
+              "name": "dcae_collector_ip",
+              "value": "10.0.4.102"
+            },
+            {
+              "name": "dcae_collector_port",
+              "value": "8080"
+            },
+            {
+              "name": "repo_url_blob",
+              "value": "https://nexus.onap.org/content/sites/raw"
+            },
+            {
+              "name": "repo_url_artifacts",
+              "value": "https://nexus.onap.org/content/repositories/releases"
+            },
+            {
+              "name": "demo_artifacts_version",
+              "value": "1.1.1"
+            },
+            {
+              "name": "script_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "key_name",
+              "value": "vbng_key"
+            },
+            {
+              "name": "pub_key",
+              "value": "${pub_key}"
+            },
+            {
+              "name": "cloud_env",
+              "value": "openstack"
+            },
+            {
+              "name": "vpp_source_repo_url",
+              "value": "https://gerrit.fd.io/r/vpp"
+            },
+            {
+              "name": "vpp_source_repo_branch",
+              "value": "stable/1704"
+            },
+            {
+              "name": "vpp_patch_url",
+              "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch"
             }
+          ]
+        },
+        "vf-module-assignments": {},
+        "vf-module-topology-identifier": {
+          "vf-module-name": "${vnf_name}"
+        }
+      },
+      "vnf-resource-assignments": {},
+      "vnf-topology-identifier-structure": {
+        "nf-type": "${vnf_type}",
+        "vnf-id": "${vnf_name}"
       }
+    }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
index 2630ee7..cf78888 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_brgemu_vfmodule.json
@@ -1,138 +1,138 @@
 {
-    "VNF-API:input": {
-        "VNF-API:request-information": {
-            "VNF-API:notification-url": "https://so.onap.org",
-            "VNF-API:order-number": "robot12",
-            "VNF-API:order-version": "1.0",
-            "VNF-API:request-action": "PreloadVNFRequest",
-            "VNF-API:request-id": "robot12",
-            "VNF-API:request-sub-action": "SUPP",
-            "VNF-API:source": "VID"
-        },
-        "VNF-API:sdnc-request-header": {
-            "VNF-API:svc-action": "reserve",
-            "VNF-API:svc-notification-url": "https://son.onap.org",
-            "VNF-API:svc-request-id": "robot12"
-        },
-        "VNF-API:vnf-topology-information": {
-            "VNF-API:vnf-assignments": {},
-            "VNF-API:vnf-parameters": [
-                {
-                    "vnf-parameter-name": "vcpe_image_name",
-                    "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04"
-                },
-                {
-                    "vnf-parameter-name": "vcpe_flavor_name",
-                    "vnf-parameter-value": "m1.medium"
-                },
-                {
-                    "vnf-parameter-name": "public_net_id",
-                    "vnf-parameter-value": "${public_net_id}"
-                },
-                {
-                    "vnf-parameter-name": "vbrgemu_bng_private_net_id",
-                    "vnf-parameter-value": "${brg_bng_net}"
-                },
-                {
-                    "vnf-parameter-name": "vbrgemu_bng_private_subnet_id",
-                    "vnf-parameter-value": "${brg_bng_subnet}"
-                },
-                {
-                    "vnf-parameter-name": "onap_private_net_id",
-                    "vnf-parameter-value": "${oam_onap_net}"
-                },
-                {
-                    "vnf-parameter-name": "onap_private_subnet_id",
-                    "vnf-parameter-value": "${oam_onap_subnet}"
-                },
-                {
-                    "vnf-parameter-name": "onap_private_net_cidr",
-                    "vnf-parameter-value": "10.0.0.0/16"
-                },
-                {
-                    "vnf-parameter-name": "compile_state",
-                    "vnf-parameter-value": "done"
-                },
-                {
-                    "vnf-parameter-name": "vbrgemu_bng_private_net_cidr",
-                    "vnf-parameter-value": "10.3.0.0/24"
-                },
-                {
-                    "vnf-parameter-name": "vbrgemu_private_ip_0",
-                    "vnf-parameter-value": "10.3.0.21"
-                },
-                {
-                    "vnf-parameter-name": "sdnc_ip",
-                    "vnf-parameter-value": "${sdnc_oam_ip}"
-                },
-                {
-                    "vnf-parameter-name": "vbrgemu_name_0",
-                    "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}"
-                },
-                {
-                    "vnf-parameter-name": "vnf_id",
-                    "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}"
-                },
-                {
-                    "vnf-parameter-name": "vf_module_id",
-                    "vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}"
-                },
-                {
-                    "vnf-parameter-name": "repo_url_blob",
-                    "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
-                },
-                {
-                    "vnf-parameter-name": "repo_url_artifacts",
-                    "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
-                },
-                {
-                    "vnf-parameter-name": "demo_artifacts_version",
-                    "vnf-parameter-value": "1.1.1"
-                },
-                {
-                    "vnf-parameter-name": "script_version",
-                    "vnf-parameter-value": "1.3.0"
-                },
-                {
-                    "vnf-parameter-name": "key_name",
-                    "vnf-parameter-value": "vbrgemu_key"
-                },
-                {
-                    "vnf-parameter-name": "pub_key",
-                    "vnf-parameter-value": "${pub_key}"
-                },
-                {
-                    "vnf-parameter-name": "cloud_env",
-                    "vnf-parameter-value": "openstack"
-                },
-                {
-                    "vnf-parameter-name": "vpp_source_repo_url",
-                    "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
-                },
-                {
-                    "vnf-parameter-name": "vpp_source_repo_branch",
-                    "vnf-parameter-value": "stable/1704"
-                },
-                {
-                    "vnf-parameter-name": "hc2vpp_source_repo_url",
-                    "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp"
-                },
-                {
-                    "vnf-parameter-name": "hc2vpp_source_repo_branch",
-                    "vnf-parameter-value": "stable/1704"
-                },
-                {
-                    "vnf-parameter-name": "vpp_patch_url",
-                    "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
-                }
-            ],
-            "vnf-topology-identifier": {
-                "generic-vnf-name": "${generic_vnf_name}",
-                "generic-vnf-type": "${generic_vnf_type}",
-                "service-type": "${service_type}",
-                "vnf-name": "${vnf_name}",
-                "vnf-type": "${vnf_type}"
-            }
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:notification-url": "https://so.onap.org",
+      "VNF-API:order-number": "robot12",
+      "VNF-API:order-version": "1.0",
+      "VNF-API:request-action": "PreloadVNFRequest",
+      "VNF-API:request-id": "robot12",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:source": "VID"
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "https://son.onap.org",
+      "VNF-API:svc-request-id": "robot12"
+    },
+    "VNF-API:vnf-topology-information": {
+      "VNF-API:vnf-assignments": {},
+      "VNF-API:vnf-parameters": [
+        {
+          "vnf-parameter-name": "vcpe_image_name",
+          "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04"
+        },
+        {
+          "vnf-parameter-name": "vcpe_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "vbrgemu_bng_private_net_id",
+          "vnf-parameter-value": "${brg_bng_net}"
+        },
+        {
+          "vnf-parameter-name": "vbrgemu_bng_private_subnet_id",
+          "vnf-parameter-value": "${brg_bng_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${oam_onap_net}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${oam_onap_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "compile_state",
+          "vnf-parameter-value": "done"
+        },
+        {
+          "vnf-parameter-name": "vbrgemu_bng_private_net_cidr",
+          "vnf-parameter-value": "10.3.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "vbrgemu_private_ip_0",
+          "vnf-parameter-value": "10.3.0.21"
+        },
+        {
+          "vnf-parameter-name": "sdnc_ip",
+          "vnf-parameter-value": "${sdnc_oam_ip}"
+        },
+        {
+          "vnf-parameter-name": "vbrgemu_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vnf_id",
+          "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vf_module_id",
+          "vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "repo_url_blob",
+          "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+        },
+        {
+          "vnf-parameter-name": "repo_url_artifacts",
+          "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
+        },
+        {
+          "vnf-parameter-name": "demo_artifacts_version",
+          "vnf-parameter-value": "1.1.1"
+        },
+        {
+          "vnf-parameter-name": "script_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "key_name",
+          "vnf-parameter-value": "vbrgemu_key"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_url",
+          "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_branch",
+          "vnf-parameter-value": "stable/1704"
+        },
+        {
+          "vnf-parameter-name": "hc2vpp_source_repo_url",
+          "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp"
+        },
+        {
+          "vnf-parameter-name": "hc2vpp_source_repo_branch",
+          "vnf-parameter-value": "stable/1704"
+        },
+        {
+          "vnf-parameter-name": "vpp_patch_url",
+          "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
         }
+      ],
+      "vnf-topology-identifier": {
+        "generic-vnf-name": "${generic_vnf_name}",
+        "generic-vnf-type": "${generic_vnf_type}",
+        "service-type": "${service_type}",
+        "vnf-name": "${vnf_name}",
+        "vnf-type": "${vnf_type}"
+      }
     }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_brgemugra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_brgemugra_vfmodule.json
index 4d5b2d4..f278261 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_brgemugra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_brgemugra_vfmodule.json
@@ -1,141 +1,142 @@
 {
-       "GENERIC-RESOURCE-API:input": {
-               "GENERIC-RESOURCE-API:request-information": {
-                       "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
-                       "GENERIC-RESOURCE-API:order-number": "robot12",
-                       "GENERIC-RESOURCE-API:order-version": "1.0",
-                       "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
-                       "GENERIC-RESOURCE-API:request-id": "robot12",
-                       "GENERIC-RESOURCE-API:source": "VID"
-               },
-               "GENERIC-RESOURCE-API:sdnc-request-header": {
-                       "GENERIC-RESOURCE-API:svc-action": "reserve",
-                       "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
-                       "GENERIC-RESOURCE-API:svc-request-id": "robot12"
-               },
-               "preload-vf-module-topology-information": {
-                       "vf-module-topology": {
-                               "vf-module-parameters":  {
-                                       "param": [
-                                               {
-                                                   "name": "vcpe_image_name",
-                                                   "value": "vbrg-casa-base-ubuntu-16-04"
-                                               },
-                                               {
-                                                   "name": "vcpe_flavor_name",
-                                                   "value": "m1.medium"
-                                               },
-                                               {
-                                                   "name": "public_net_id",
-                                                   "value": "${public_net_id}"
-                                               },
-                                               {
-                                                   "name": "vbrgemu_bng_private_net_id",
-                                                   "value": "${brg_bng_net}"
-                                               },
-                                               {
-                                                   "name": "vbrgemu_bng_private_subnet_id",
-                                                   "value": "${brg_bng_subnet}"
-                                               },
-                                               {
-                                                   "name": "onap_private_net_id",
-                                                   "value": "${oam_onap_net}"
-                                               },
-                                               {
-                                                   "name": "onap_private_subnet_id",
-                                                   "value": "${oam_onap_subnet}"
-                                               },
-                                               {
-                                                   "name": "onap_private_net_cidr",
-                                                   "value": "10.0.0.0/16"
-                                               },
-                                               {
-                                                   "name": "compile_state",
-                                                   "value": "done"
-                                               },
-                                               {
-                                                   "name": "vbrgemu_bng_private_net_cidr",
-                                                   "value": "10.3.0.0/24"
-                                               },
-                                               {
-                                                   "name": "vbrgemu_private_ip_0",
-                                                   "value": "10.3.0.21"
-                                               },
-                                               {
-                                                   "name": "sdnc_ip",
-                                                   "value": "${sdnc_oam_ip}"
-                                               },
-                                               {
-                                                   "name": "vbrgemu_name_0",
-                                                   "value": "zdcpe1cpe01brgemu01_${suffix}"
-                                               },
-                                               {
-                                                   "name": "vnf_id",
-                                                   "value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}"
-                                               },
-                                               {
-                                                   "name": "vf_module_id",
-                                                   "value": "vCPE_Customer_BRGEMU_${suffix}"
-                                               },
-                                               {
-                                                   "name": "repo_url_blob",
-                                                   "value": "https://nexus.onap.org/content/sites/raw"
-                                               },
-                                               {
-                                                   "name": "repo_url_artifacts",
-                                                   "value": "https://nexus.onap.org/content/repositories/releases"
-                                               },
-                                               {
-                                                   "name": "demo_artifacts_version",
-                                                   "value": "1.1.1"
-                                               },
-                                               {
-                                                   "name": "script_version",
-                                                   "value": "1.3.0"
-                                               },
-                                               {
-                                                   "name": "key_name",
-                                                   "value": "vbrgemu_key"
-                                               },
-                                               {
-                                                   "name": "pub_key",
-                                                   "value": "${pub_key}"
-                                               },
-                                               {
-                                                   "name": "cloud_env",
-                                                   "value": "openstack"
-                                               },
-                                               {
-                                                   "name": "vpp_source_repo_url",
-                                                   "value": "https://gerrit.fd.io/r/vpp"
-                                               },
-                                               {
-                                                   "name": "vpp_source_repo_branch",
-                                                   "value": "stable/1704"
-                                               },
-                                               {
-                                                   "name": "hc2vpp_source_repo_url",
-                                                   "value": "https://gerrit.fd.io/r/hc2vpp"
-                                               },
-                                               {
-                                                   "name": "hc2vpp_source_repo_branch",
-                                                   "value": "stable/1704"
-                                               },
-                                               {
-                                                   "name": "vpp_patch_url",
-                                                   "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
-                                                }
-                               ] },
-                               "vf-module-assignments":  {},
-                                "vf-module-topology-identifier": {
-                                        "vf-module-name": "${vnf_name}"
-                                }
-                       },
-                      "vnf-resource-assignments": {},
-                       "vnf-topology-identifier-structure": {
-                                       "nf-type": "${vnf_type}",
-                                       "vnf-id": "${vnf_name}"
-                      }
-               }
+  "GENERIC-RESOURCE-API:input": {
+    "GENERIC-RESOURCE-API:request-information": {
+      "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
+      "GENERIC-RESOURCE-API:order-number": "robot12",
+      "GENERIC-RESOURCE-API:order-version": "1.0",
+      "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
+      "GENERIC-RESOURCE-API:request-id": "robot12",
+      "GENERIC-RESOURCE-API:source": "VID"
+    },
+    "GENERIC-RESOURCE-API:sdnc-request-header": {
+      "GENERIC-RESOURCE-API:svc-action": "reserve",
+      "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
+      "GENERIC-RESOURCE-API:svc-request-id": "robot12"
+    },
+    "preload-vf-module-topology-information": {
+      "vf-module-topology": {
+        "vf-module-parameters": {
+          "param": [
+            {
+              "name": "vcpe_image_name",
+              "value": "vbrg-casa-base-ubuntu-16-04"
+            },
+            {
+              "name": "vcpe_flavor_name",
+              "value": "m1.medium"
+            },
+            {
+              "name": "public_net_id",
+              "value": "${public_net_id}"
+            },
+            {
+              "name": "vbrgemu_bng_private_net_id",
+              "value": "${brg_bng_net}"
+            },
+            {
+              "name": "vbrgemu_bng_private_subnet_id",
+              "value": "${brg_bng_subnet}"
+            },
+            {
+              "name": "onap_private_net_id",
+              "value": "${oam_onap_net}"
+            },
+            {
+              "name": "onap_private_subnet_id",
+              "value": "${oam_onap_subnet}"
+            },
+            {
+              "name": "onap_private_net_cidr",
+              "value": "10.0.0.0/16"
+            },
+            {
+              "name": "compile_state",
+              "value": "done"
+            },
+            {
+              "name": "vbrgemu_bng_private_net_cidr",
+              "value": "10.3.0.0/24"
+            },
+            {
+              "name": "vbrgemu_private_ip_0",
+              "value": "10.3.0.21"
+            },
+            {
+              "name": "sdnc_ip",
+              "value": "${sdnc_oam_ip}"
+            },
+            {
+              "name": "vbrgemu_name_0",
+              "value": "zdcpe1cpe01brgemu01_${suffix}"
+            },
+            {
+              "name": "vnf_id",
+              "value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}"
+            },
+            {
+              "name": "vf_module_id",
+              "value": "vCPE_Customer_BRGEMU_${suffix}"
+            },
+            {
+              "name": "repo_url_blob",
+              "value": "https://nexus.onap.org/content/sites/raw"
+            },
+            {
+              "name": "repo_url_artifacts",
+              "value": "https://nexus.onap.org/content/repositories/releases"
+            },
+            {
+              "name": "demo_artifacts_version",
+              "value": "1.1.1"
+            },
+            {
+              "name": "script_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "key_name",
+              "value": "vbrgemu_key"
+            },
+            {
+              "name": "pub_key",
+              "value": "${pub_key}"
+            },
+            {
+              "name": "cloud_env",
+              "value": "openstack"
+            },
+            {
+              "name": "vpp_source_repo_url",
+              "value": "https://gerrit.fd.io/r/vpp"
+            },
+            {
+              "name": "vpp_source_repo_branch",
+              "value": "stable/1704"
+            },
+            {
+              "name": "hc2vpp_source_repo_url",
+              "value": "https://gerrit.fd.io/r/hc2vpp"
+            },
+            {
+              "name": "hc2vpp_source_repo_branch",
+              "value": "stable/1704"
+            },
+            {
+              "name": "vpp_patch_url",
+              "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch"
+            }
+          ]
+        },
+        "vf-module-assignments": {},
+        "vf-module-topology-identifier": {
+          "vf-module-name": "${vnf_name}"
+        }
+      },
+      "vnf-resource-assignments": {},
+      "vnf-topology-identifier-structure": {
+        "nf-type": "${vnf_type}",
+        "vnf-id": "${vnf_name}"
       }
+    }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json
index a1ebf2a..ad0f918 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_gmux_vfmodule.json
@@ -1,160 +1,158 @@
 {
-   "VNF-API:input": {
-     "VNF-API:request-information": {
-       "VNF-API:request-id": "robot12",
-       "VNF-API:notification-url": "https://so.onap.org",
-       "VNF-API:order-number": "robot12",
-       "VNF-API:request-sub-action": "SUPP",
-       "VNF-API:request-action": "PreloadVNFRequest",
-       "VNF-API:source": "VID",
-       "VNF-API:order-version": "1.0"
-     },
-     "VNF-API:sdnc-request-header": {
-       "VNF-API:svc-action": "reserve",
-       "VNF-API:svc-notification-url": "https://son.onap.org",
-       "VNF-API:svc-request-id": "robot12"
-     },
-     "VNF-API:vnf-topology-information": {
-             "vnf-topology-identifier": {
-               "service-type": "${service_type}",
-               "vnf-type": "${vnf_type}",
-               "generic-vnf-name": "${generic_vnf_name}",
-               "generic-vnf-type": "${generic_vnf_type}",
-               "vnf-name": "${vnf_name}"
-       },
-       "VNF-API:vnf-parameters": [
-               {
-               "vnf-parameter-name": "vcpe_image_name",
-               "vnf-parameter-value": "vgmux-casa-base-ubuntu-16-04"
-               },
-               {
-               "vnf-parameter-name": "vcpe_flavor_name",
-               "vnf-parameter-value": "m1.medium"
-               },
-               {
-               "vnf-parameter-name": "public_net_id",
-               "vnf-parameter-value": "${public_net_id}"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_net_id",
-               "vnf-parameter-value": "${bng_mux_net}"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_subnet_id",
-               "vnf-parameter-value": "${bng_mux_subnet}"
-               },
-               {
-               "vnf-parameter-name": "mux_gw_private_net_id",
-               "vnf-parameter-value": "${mux_gw_net}"
-               },
-               {
-               "vnf-parameter-name": "mux_gw_private_subnet_id",
-               "vnf-parameter-value": "${mux_gw_subnet}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_net_id",
-               "vnf-parameter-value": "${oam_onap_net}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_subnet_id",
-               "vnf-parameter-value": "${oam_onap_subnet}"
-               },
-               {
-               "vnf-parameter-name": "onap_private_net_cidr",
-               "vnf-parameter-value": "10.0.0.0/16"
-               },
-               {
-               "vnf-parameter-name": "mux_gw_private_net_cidr",
-               "vnf-parameter-value": "10.5.0.0/24"
-               },
-               {
-               "vnf-parameter-name": "bng_gmux_private_net_cidr",
-               "vnf-parameter-value": "10.1.0.0/24"
-               },
-               {
-               "vnf-parameter-name": "vgmux_private_ip_0",
-               "vnf-parameter-value": "10.1.0.21"
-               },
-               {
-               "vnf-parameter-name": "vgmux_private_ip_1",
-               "vnf-parameter-value": "10.0.101.21"
-               },
-               {
-               "vnf-parameter-name": "vgmux_private_ip_2",
-               "vnf-parameter-value": "10.5.0.21"
-               },
-               {
-               "vnf-parameter-name": "vgmux_name_0",
-               "vnf-parameter-value": "zdcpe1cpe01mux01_${suffix}"
-               },
-               {
-               "vnf-parameter-name": "vnf_id",
-               "vnf-parameter-value": "vCPE_Infrastructure_Metro_vGMUX_demo_app"
-               },
-               {
-               "vnf-parameter-name": "vf_module_id",
-               "vnf-parameter-value": "vCPE_Intrastructure_Metro_vGMUX"
-               },
-               {
-               "vnf-parameter-name": "dcae_collector_ip",
-               "vnf-parameter-value": "10.0.4.102"
-               },
-               {
-               "vnf-parameter-name": "dcae_collector_port",
-               "vnf-parameter-value": "8080"
-               },
-               {
-               "vnf-parameter-name": "repo_url_blob",
-               "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
-               },
-               {
-               "vnf-parameter-name": "repo_url_artifacts",
-               "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
-               },
-               {
-               "vnf-parameter-name": "demo_artifacts_version",
-               "vnf-parameter-value": "1.1.1"
-               },
-               {
-               "vnf-parameter-name": "script_version",
-               "vnf-parameter-value": "1.3.0"
-               },
-               {
-               "vnf-parameter-name": "key_name",
-               "vnf-parameter-value": "vgmux_key"
-               },
-               {
-               "vnf-parameter-name": "pub_key",
-               "vnf-parameter-value": "${pub_key}"
-               },
-               {
-               "vnf-parameter-name": "cloud_env",
-               "vnf-parameter-value": "openstack"
-               },
-               {
-               "vnf-parameter-name": "vpp_source_repo_url",
-               "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
-               },
-               {
-               "vnf-parameter-name": "vpp_source_repo_branch",
-               "vnf-parameter-value": "stable/1704"
-               },
-               {
-               "vnf-parameter-name": "vpp_patch_url",
-               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch"
-               },
-               {
-               "vnf-parameter-name": "hc2vpp_patch_url",
-               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch"
-               },
-               {
-               "vnf-parameter-name": "libevel_patch_url",
-               "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch"
-               }
-       ],
-       "VNF-API:vnf-assignments": {
-         }
-       }
-     }
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:request-id": "robot12",
+      "VNF-API:notification-url": "https://so.onap.org",
+      "VNF-API:order-number": "robot12",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:request-action": "PreloadVNFRequest",
+      "VNF-API:source": "VID",
+      "VNF-API:order-version": "1.0"
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "https://son.onap.org",
+      "VNF-API:svc-request-id": "robot12"
+    },
+    "VNF-API:vnf-topology-information": {
+      "vnf-topology-identifier": {
+        "service-type": "${service_type}",
+        "vnf-type": "${vnf_type}",
+        "generic-vnf-name": "${generic_vnf_name}",
+        "generic-vnf-type": "${generic_vnf_type}",
+        "vnf-name": "${vnf_name}"
+      },
+      "VNF-API:vnf-parameters": [
+        {
+          "vnf-parameter-name": "vcpe_image_name",
+          "vnf-parameter-value": "vgmux-casa-base-ubuntu-16-04"
+        },
+        {
+          "vnf-parameter-name": "vcpe_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_net_id",
+          "vnf-parameter-value": "${bng_mux_net}"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_subnet_id",
+          "vnf-parameter-value": "${bng_mux_subnet}"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_net_id",
+          "vnf-parameter-value": "${mux_gw_net}"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_subnet_id",
+          "vnf-parameter-value": "${mux_gw_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${oam_onap_net}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${oam_onap_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_net_cidr",
+          "vnf-parameter-value": "10.5.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "bng_gmux_private_net_cidr",
+          "vnf-parameter-value": "10.1.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "vgmux_private_ip_0",
+          "vnf-parameter-value": "10.1.0.21"
+        },
+        {
+          "vnf-parameter-name": "vgmux_private_ip_1",
+          "vnf-parameter-value": "10.0.101.21"
+        },
+        {
+          "vnf-parameter-name": "vgmux_private_ip_2",
+          "vnf-parameter-value": "10.5.0.21"
+        },
+        {
+          "vnf-parameter-name": "vgmux_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01mux01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vnf_id",
+          "vnf-parameter-value": "vCPE_Infrastructure_Metro_vGMUX_demo_app"
+        },
+        {
+          "vnf-parameter-name": "vf_module_id",
+          "vnf-parameter-value": "vCPE_Intrastructure_Metro_vGMUX"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_ip",
+          "vnf-parameter-value": "10.0.4.102"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_port",
+          "vnf-parameter-value": "8080"
+        },
+        {
+          "vnf-parameter-name": "repo_url_blob",
+          "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+        },
+        {
+          "vnf-parameter-name": "repo_url_artifacts",
+          "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
+        },
+        {
+          "vnf-parameter-name": "demo_artifacts_version",
+          "vnf-parameter-value": "1.1.1"
+        },
+        {
+          "vnf-parameter-name": "script_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "key_name",
+          "vnf-parameter-value": "vgmux_key"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_url",
+          "vnf-parameter-value": "https://gerrit.fd.io/r/vpp"
+        },
+        {
+          "vnf-parameter-name": "vpp_source_repo_branch",
+          "vnf-parameter-value": "stable/1704"
+        },
+        {
+          "vnf-parameter-name": "vpp_patch_url",
+          "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch"
+        },
+        {
+          "vnf-parameter-name": "hc2vpp_patch_url",
+          "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch"
+        },
+        {
+          "vnf-parameter-name": "libevel_patch_url",
+          "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch"
+        }
+      ],
+      "VNF-API:vnf-assignments": {}
+    }
+  }
 }
-

diff --git a/test/vcpe/preload_templates/template.vcpe_gmuxgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gmuxgra_vfmodule.json
index b97ac94..09ae404 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_gmuxgra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_gmuxgra_vfmodule.json
@@ -1,161 +1,162 @@
 {
-       "GENERIC-RESOURCE-API:input": {
-               "GENERIC-RESOURCE-API:request-information": {
-                       "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
-                       "GENERIC-RESOURCE-API:order-number": "robot12",
-                       "GENERIC-RESOURCE-API:order-version": "1.0",
-                       "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
-                       "GENERIC-RESOURCE-API:request-id": "robot12",
-                       "GENERIC-RESOURCE-API:source": "VID"
-               },
-               "GENERIC-RESOURCE-API:sdnc-request-header": {
-                       "GENERIC-RESOURCE-API:svc-action": "reserve",
-                       "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
-                       "GENERIC-RESOURCE-API:svc-request-id": "robot12"
-               },
-               "preload-vf-module-topology-information": {
-                       "vf-module-topology": {
-                               "vf-module-parameters":  {
-                                       "param": [
-                                               {
-                                               "name": "vcpe_image_name",
-                                               "value": "vgmux-casa-base-ubuntu-16-04"
-                                               },
-                                               {
-                                               "name": "vcpe_flavor_name",
-                                               "value": "m1.medium"
-                                               },
-                                               {
-                                               "name": "public_net_id",
-                                               "value": "${public_net_id}"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_net_id",
-                                               "value": "${bng_mux_net}"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_subnet_id",
-                                               "value": "${bng_mux_subnet}"
-                                               },
-                                               {
-                                               "name": "mux_gw_private_net_id",
-                                               "value": "${mux_gw_net}"
-                                               },
-                                               {
-                                               "name": "mux_gw_private_subnet_id",
-                                               "value": "${mux_gw_subnet}"
-                                               },
-                                               {
-                                               "name": "onap_private_net_id",
-                                               "value": "${oam_onap_net}"
-                                               },
-                                               {
-                                               "name": "onap_private_subnet_id",
-                                               "value": "${oam_onap_subnet}"
-                                               },
-                                               {
-                                               "name": "onap_private_net_cidr",
-                                               "value": "10.0.0.0/16"
-                                               },
-                                               {
-                                               "name": "mux_gw_private_net_cidr",
-                                               "value": "10.5.0.0/24"
-                                               },
-                                               {
-                                               "name": "bng_gmux_private_net_cidr",
-                                               "value": "10.1.0.0/24"
-                                               },
-                                               {
-                                               "name": "vgmux_private_ip_0",
-                                               "value": "10.1.0.21"
-                                               },
-                                               {
-                                               "name": "vgmux_private_ip_1",
-                                               "value": "10.0.101.21"
-                                               },
-                                               {
-                                               "name": "vgmux_private_ip_2",
-                                               "value": "10.5.0.21"
-                                               },
-                                               {
-                                               "name": "vgmux_name_0",
-                                               "value": "zdcpe1cpe01mux01_${suffix}"
-                                               },
-                                               {
-                                               "name": "vnf_id",
-                                               "value": "vCPE_Infrastructure_Metro_vGMUX_demo_app"
-                                               },
-                                               {
-                                               "name": "vf_module_id",
-                                               "value": "vCPE_Intrastructure_Metro_vGMUX"
-                                               },
-                                               {
-                                               "name": "dcae_collector_ip",
-                                               "value": "10.0.4.102"
-                                               },
-                                               {
-                                               "name": "dcae_collector_port",
-                                               "value": "8080"
-                                               },
-                                               {
-                                               "name": "repo_url_blob",
-                                               "value": "https://nexus.onap.org/content/sites/raw"
-                                               },
-                                               {
-                                               "name": "repo_url_artifacts",
-                                               "value": "https://nexus.onap.org/content/repositories/releases"
-                                               },
-                                               {
-                                               "name": "demo_artifacts_version",
-                                               "value": "1.1.1"
-                                               },
-                                               {
-                                               "name": "script_version",
-                                               "value": "1.3.0"
-                                               },
-                                               {
-                                               "name": "key_name",
-                                               "value": "vgmux_key"
-                                               },
-                                               {
-                                               "name": "pub_key",
-                                               "value": "${pub_key}"
-                                               },
-                                               {
-                                               "name": "cloud_env",
-                                               "value": "openstack"
-                                               },
-                                               {
-                                               "name": "vpp_source_repo_url",
-                                               "value": "https://gerrit.fd.io/r/vpp"
-                                               },
-                                               {
-                                               "name": "vpp_source_repo_branch",
-                                               "value": "stable/1704"
-                                               },
-                                               {
-                                               "name": "vpp_patch_url",
-                                               "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch"
-                                               },
-                                               {
-                                               "name": "hc2vpp_patch_url",
-                                               "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch"
-                                               },
-                                               {
-                                               "name": "libevel_patch_url",
-                                               "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch"
-                                               }
-                               ] },
-                               "vf-module-assignments":  {},
-                                "vf-module-topology-identifier": {
-                                        "vf-module-name": "${vnf_name}"
-                                }
-                       },
-                       "vnf-resource-assignments": {},
-                       "vnf-topology-identifier-structure": {
-                                       "nf-type": "${vnf_type}",
-                                       "vnf-id": "${vnf_name}"
-                       }
+  "GENERIC-RESOURCE-API:input": {
+    "GENERIC-RESOURCE-API:request-information": {
+      "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
+      "GENERIC-RESOURCE-API:order-number": "robot12",
+      "GENERIC-RESOURCE-API:order-version": "1.0",
+      "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
+      "GENERIC-RESOURCE-API:request-id": "robot12",
+      "GENERIC-RESOURCE-API:source": "VID"
+    },
+    "GENERIC-RESOURCE-API:sdnc-request-header": {
+      "GENERIC-RESOURCE-API:svc-action": "reserve",
+      "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
+      "GENERIC-RESOURCE-API:svc-request-id": "robot12"
+    },
+    "preload-vf-module-topology-information": {
+      "vf-module-topology": {
+        "vf-module-parameters": {
+          "param": [
+            {
+              "name": "vcpe_image_name",
+              "value": "vgmux-casa-base-ubuntu-16-04"
+            },
+            {
+              "name": "vcpe_flavor_name",
+              "value": "m1.medium"
+            },
+            {
+              "name": "public_net_id",
+              "value": "${public_net_id}"
+            },
+            {
+              "name": "bng_gmux_private_net_id",
+              "value": "${bng_mux_net}"
+            },
+            {
+              "name": "bng_gmux_private_subnet_id",
+              "value": "${bng_mux_subnet}"
+            },
+            {
+              "name": "mux_gw_private_net_id",
+              "value": "${mux_gw_net}"
+            },
+            {
+              "name": "mux_gw_private_subnet_id",
+              "value": "${mux_gw_subnet}"
+            },
+            {
+              "name": "onap_private_net_id",
+              "value": "${oam_onap_net}"
+            },
+            {
+              "name": "onap_private_subnet_id",
+              "value": "${oam_onap_subnet}"
+            },
+            {
+              "name": "onap_private_net_cidr",
+              "value": "10.0.0.0/16"
+            },
+            {
+              "name": "mux_gw_private_net_cidr",
+              "value": "10.5.0.0/24"
+            },
+            {
+              "name": "bng_gmux_private_net_cidr",
+              "value": "10.1.0.0/24"
+            },
+            {
+              "name": "vgmux_private_ip_0",
+              "value": "10.1.0.21"
+            },
+            {
+              "name": "vgmux_private_ip_1",
+              "value": "10.0.101.21"
+            },
+            {
+              "name": "vgmux_private_ip_2",
+              "value": "10.5.0.21"
+            },
+            {
+              "name": "vgmux_name_0",
+              "value": "zdcpe1cpe01mux01_${suffix}"
+            },
+            {
+              "name": "vnf_id",
+              "value": "vCPE_Infrastructure_Metro_vGMUX_demo_app"
+            },
+            {
+              "name": "vf_module_id",
+              "value": "vCPE_Intrastructure_Metro_vGMUX"
+            },
+            {
+              "name": "dcae_collector_ip",
+              "value": "10.0.4.102"
+            },
+            {
+              "name": "dcae_collector_port",
+              "value": "8080"
+            },
+            {
+              "name": "repo_url_blob",
+              "value": "https://nexus.onap.org/content/sites/raw"
+            },
+            {
+              "name": "repo_url_artifacts",
+              "value": "https://nexus.onap.org/content/repositories/releases"
+            },
+            {
+              "name": "demo_artifacts_version",
+              "value": "1.1.1"
+            },
+            {
+              "name": "script_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "key_name",
+              "value": "vgmux_key"
+            },
+            {
+              "name": "pub_key",
+              "value": "${pub_key}"
+            },
+            {
+              "name": "cloud_env",
+              "value": "openstack"
+            },
+            {
+              "name": "vpp_source_repo_url",
+              "value": "https://gerrit.fd.io/r/vpp"
+            },
+            {
+              "name": "vpp_source_repo_branch",
+              "value": "stable/1704"
+            },
+            {
+              "name": "vpp_patch_url",
+              "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch"
+            },
+            {
+              "name": "hc2vpp_patch_url",
+              "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch"
+            },
+            {
+              "name": "libevel_patch_url",
+              "value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch"
             }
+          ]
+        },
+        "vf-module-assignments": {},
+        "vf-module-topology-identifier": {
+          "vf-module-name": "${vnf_name}"
+        }
+      },
+      "vnf-resource-assignments": {},
+      "vnf-topology-identifier-structure": {
+        "nf-type": "${vnf_type}",
+        "vnf-id": "${vnf_name}"
       }
+    }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
index 48883b9..6a78370 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_gwgra_vfmodule.json
@@ -1,133 +1,134 @@
 {
-       "GENERIC-RESOURCE-API:input": {
-               "GENERIC-RESOURCE-API:request-information": {
-                       "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
-                       "GENERIC-RESOURCE-API:order-number": "robot12",
-                       "GENERIC-RESOURCE-API:order-version": "1.0",
-                       "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
-                       "GENERIC-RESOURCE-API:request-id": "robot12",
-                       "GENERIC-RESOURCE-API:source": "VID"
-               },
-               "GENERIC-RESOURCE-API:sdnc-request-header": {
-                       "GENERIC-RESOURCE-API:svc-action": "reserve",
-                       "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
-                       "GENERIC-RESOURCE-API:svc-request-id": "robot12"
-               },
-               "preload-vf-module-topology-information": {
-                       "vf-module-topology": {
-                               "vf-module-parameters":  {
-                                       "param": [
-                                        {
-                                            "name": "vcpe_image_name",
-                                            "value": "vgw-casa-base-ubuntu-16-04"
-                                        },
-                                        {
-                                            "name": "vcpe_flavor_name",
-                                            "value": "m1.medium"
-                                        },
-                                       {
-                                           "name": "public_net_id", 
-                                           "value": "${public_net_id}"
-                                       }, 
-                                       {
-                                           "name": "mux_gw_private_net_id", 
-                                           "value": "${mux_gw_net}"
-                                       }, 
-                                       {
-                                           "name": "mux_gw_private_subnet_id", 
-                                           "value": "${mux_gw_subnet}"
-                                       }, 
-                                       {
-                                           "name": "mux_gw_private_net_cidr", 
-                                           "value": "10.5.0.0/24"
-                                       }, 
-                                       {
-                                           "name": "cpe_public_net_id", 
-                                           "value": "${cpe_public_net}"
-                                       }, 
-                                       {
-                                           "name": "cpe_public_subnet_id", 
-                                           "value": "${cpe_public_subnet}"
-                                       }, 
-                                       {
-                                           "name": "cpe_public_net_cidr", 
-                                           "value": "10.2.0.0/24"
-                                       }, 
-                                       {
-                                           "name": "vgw_private_ip_0", 
-                                           "value": "10.5.0.92"
-                                       }, 
-                                       {
-                                           "name": "vgw_private_ip_1", 
-                                           "value": "10.0.101.92"
-                                       }, 
-                                       {
-                                           "name": "vgw_private_ip_2", 
-                                           "value": "10.2.0.7"
-                                       }, 
-                                       {
-                                           "name": "vgw_name_0", 
-                                           "value": "zdcpe1cpe01gw01_${suffix}"
-                                       }, 
-                                       {
-                                           "name": "mux_ip_addr", 
-                                           "value": "10.5.0.21"
-                                       }, 
-                                       {
-                                           "name": "vg_vgmux_tunnel_vni", 
-                                           "value": "92"
-                                       }, 
-                                       {
-                                           "name": "onap_private_net_id", 
-                                           "value": "${oam_onap_net}"
-                                       }, 
-                                       {
-                                           "name": "onap_private_subnet_id", 
-                                           "value": "${oam_onap_subnet}"
-                                       }, 
-                                       {
-                                           "name": "onap_private_net_cidr", 
-                                           "value": "10.0.0.0/16"
-                                       }, 
-                                       {
-                                           "name": "repo_url_blob", 
-                                           "value": "https://nexus.onap.org/content/sites/raw"
-                                       }, 
-                                       {
-                                           "name": "repo_url_artifacts", 
-                                           "value": "https://nexus.onap.org/content/repositories/releases"
-                                       }, 
-                                       {
-                                           "name": "demo_artifacts_version", 
-                                           "value": "1.1.1"
-                                       }, 
-                                       {
-                                           "name": "script_version", 
-                                           "value": "1.3.0"
-                                       }, 
-                                       {
-                                           "name": "key_name", 
-                                           "value": "vgw_key"
-                                       }, 
-                                       {
-                                           "name": "pub_key", 
-                                           "value": "${pub_key}"
-                                       }, 
-                                       {
-                                           "name": "cloud_env", 
-                                           "value": "openstack"
-                                       }
-                               ] },
-                               "vf-module-assignments": {},
-                               "vf-module-topology-identifier": {
-                                       "vf-module-name": "VGW2BRG-${brg_mac}"
-                               }
-                       },
-                       "vnf-resource-assignments": {},
-                       "vnf-topology-identifier-structure": {
-                               "nf-type": "vgw",
-                                "vnf-id": "VGW2BRG-${brg_mac}" 
-                       }
-               }
-       }
+  "GENERIC-RESOURCE-API:input": {
+    "GENERIC-RESOURCE-API:request-information": {
+      "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
+      "GENERIC-RESOURCE-API:order-number": "robot12",
+      "GENERIC-RESOURCE-API:order-version": "1.0",
+      "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
+      "GENERIC-RESOURCE-API:request-id": "robot12",
+      "GENERIC-RESOURCE-API:source": "VID"
+    },
+    "GENERIC-RESOURCE-API:sdnc-request-header": {
+      "GENERIC-RESOURCE-API:svc-action": "reserve",
+      "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
+      "GENERIC-RESOURCE-API:svc-request-id": "robot12"
+    },
+    "preload-vf-module-topology-information": {
+      "vf-module-topology": {
+        "vf-module-parameters": {
+          "param": [
+            {
+              "name": "vcpe_image_name",
+              "value": "vgw-casa-base-ubuntu-16-04"
+            },
+            {
+              "name": "vcpe_flavor_name",
+              "value": "m1.medium"
+            },
+            {
+              "name": "public_net_id",
+              "value": "${public_net_id}"
+            },
+            {
+              "name": "mux_gw_private_net_id",
+              "value": "${mux_gw_net}"
+            },
+            {
+              "name": "mux_gw_private_subnet_id",
+              "value": "${mux_gw_subnet}"
+            },
+            {
+              "name": "mux_gw_private_net_cidr",
+              "value": "10.5.0.0/24"
+            },
+            {
+              "name": "cpe_public_net_id",
+              "value": "${cpe_public_net}"
+            },
+            {
+              "name": "cpe_public_subnet_id",
+              "value": "${cpe_public_subnet}"
+            },
+            {
+              "name": "cpe_public_net_cidr",
+              "value": "10.2.0.0/24"
+            },
+            {
+              "name": "vgw_private_ip_0",
+              "value": "10.5.0.92"
+            },
+            {
+              "name": "vgw_private_ip_1",
+              "value": "10.0.101.92"
+            },
+            {
+              "name": "vgw_private_ip_2",
+              "value": "10.2.0.7"
+            },
+            {
+              "name": "vgw_name_0",
+              "value": "zdcpe1cpe01gw01_${suffix}"
+            },
+            {
+              "name": "mux_ip_addr",
+              "value": "10.5.0.21"
+            },
+            {
+              "name": "vg_vgmux_tunnel_vni",
+              "value": "92"
+            },
+            {
+              "name": "onap_private_net_id",
+              "value": "${oam_onap_net}"
+            },
+            {
+              "name": "onap_private_subnet_id",
+              "value": "${oam_onap_subnet}"
+            },
+            {
+              "name": "onap_private_net_cidr",
+              "value": "10.0.0.0/16"
+            },
+            {
+              "name": "repo_url_blob",
+              "value": "https://nexus.onap.org/content/sites/raw"
+            },
+            {
+              "name": "repo_url_artifacts",
+              "value": "https://nexus.onap.org/content/repositories/releases"
+            },
+            {
+              "name": "demo_artifacts_version",
+              "value": "1.1.1"
+            },
+            {
+              "name": "script_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "key_name",
+              "value": "vgw_key"
+            },
+            {
+              "name": "pub_key",
+              "value": "${pub_key}"
+            },
+            {
+              "name": "cloud_env",
+              "value": "openstack"
+            }
+          ]
+        },
+        "vf-module-assignments": {},
+        "vf-module-topology-identifier": {
+          "vf-module-name": "VGW2BRG-${brg_mac}"
+        }
+      },
+      "vnf-resource-assignments": {},
+      "vnf-topology-identifier-structure": {
+        "nf-type": "vgw",
+        "vnf-id": "VGW2BRG-${brg_mac}"
+      }
+    }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
index 1f30e94..3699bcd 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
@@ -1,180 +1,178 @@
 {
-   "VNF-API:input": {
-     "VNF-API:request-information": {
-       "VNF-API:request-id": "robot12",
-       "VNF-API:notification-url": "https://so.onap.org",
-       "VNF-API:order-number": "robot12",
-       "VNF-API:request-sub-action": "SUPP",
-       "VNF-API:request-action": "PreloadVNFRequest",
-       "VNF-API:source": "VID",
-       "VNF-API:order-version": "1.0"
-     },
-     "VNF-API:sdnc-request-header": {
-       "VNF-API:svc-action": "reserve",
-       "VNF-API:svc-notification-url": "https://son.onap.org",
-       "VNF-API:svc-request-id": "robot12"
-     },
-     "VNF-API:vnf-topology-information": {
-             "vnf-topology-identifier": {
-               "service-type": "${service_type}",
-               "vnf-type": "${vnf_type}",
-               "generic-vnf-name": "${generic_vnf_name}",
-               "generic-vnf-type": "${generic_vnf_type}",
-               "vnf-name": "${vnf_name}"
-       },
-       "VNF-API:vnf-parameters": [
-       {
-       "vnf-parameter-name": "vcpe_image_name",
-       "vnf-parameter-value": "ubuntu-16-04-cloud-amd64"
-       },
-       {
-       "vnf-parameter-name": "vcpe_flavor_name",
-       "vnf-parameter-value": "m1.medium"
-       },
-       {
-       "vnf-parameter-name": "public_net_id",
-       "vnf-parameter-value": "${public_net_id}"
-       },
-       {
-       "vnf-parameter-name": "cpe_signal_net_id",
-       "vnf-parameter-value": "${cpe_signal_net}"
-       },
-       {
-       "vnf-parameter-name": "cpe_signal_subnet_id",
-       "vnf-parameter-value": "${cpe_signal_subnet}" 
-       },
-       {
-       "vnf-parameter-name": "cpe_public_net_id",
-       "vnf-parameter-value": "${cpe_public_net}"
-       },
-       {
-       "vnf-parameter-name": "cpe_public_subnet_id",
-       "vnf-parameter-value": "${cpe_public_subnet}"
-       },
-       {
-       "vnf-parameter-name": "onap_private_net_id",
-       "vnf-parameter-value": "${oam_onap_net}"
-       },
-       {
-       "vnf-parameter-name": "onap_private_subnet_id",
-       "vnf-parameter-value": "${oam_onap_subnet}"
-       },
-       {
-       "vnf-parameter-name": "onap_private_net_cidr",
-       "vnf-parameter-value": "10.0.0.0/16"
-       },
-       {
-       "vnf-parameter-name": "cpe_signal_net_cidr",
-       "vnf-parameter-value": "10.4.0.0/24"
-       },
-       {
-       "vnf-parameter-name": "cpe_public_net_cidr",
-       "vnf-parameter-value": "10.2.0.0/24"
-       },
-       {
-       "vnf-parameter-name": "vdhcp_private_ip_0",
-       "vnf-parameter-value": "10.4.0.1"
-       },
-       {
-       "vnf-parameter-name": "vdhcp_private_ip_1",
-       "vnf-parameter-value": "10.0.101.1"
-       },
-       {
-       "vnf-parameter-name": "vaaa_private_ip_0",
-       "vnf-parameter-value": "10.4.0.2"
-       },
-       {
-       "vnf-parameter-name": "vaaa_private_ip_1",
-       "vnf-parameter-value": "10.0.101.2"
-       },
-       {
-       "vnf-parameter-name": "vdns_private_ip_0",
-       "vnf-parameter-value": "10.2.0.1"
-       },
-       {
-       "vnf-parameter-name": "vdns_private_ip_1",
-       "vnf-parameter-value": "10.0.101.3"
-       },
-       {
-       "vnf-parameter-name": "vweb_private_ip_0",
-       "vnf-parameter-value": "10.2.0.10"
-       },
-       {
-       "vnf-parameter-name": "vweb_private_ip_1",
-       "vnf-parameter-value": "10.0.101.40"
-       },
-       {
-       "vnf-parameter-name": "mr_ip_addr",
-       "vnf-parameter-value": "${mr_ip_addr}"
-       },
-       {
-       "vnf-parameter-name": "mr_ip_port",
-       "vnf-parameter-value": "${mr_ip_port}"
-       },
-       {
-       "vnf-parameter-name": "vaaa_name_0",
-       "vnf-parameter-value": "zdcpe1cpe01aaa01_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "vdns_name_0",
-       "vnf-parameter-value": "zdcpe1cpe01dns01_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "vdhcp_name_0",
-       "vnf-parameter-value": "zdcpe1cpe01dhcp01_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "vweb_name_0",
-       "vnf-parameter-value": "zdcpe1cpe01web01_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "vnf_id",
-       "vnf-parameter-value": "vCPE_Infrastructure_demo_app_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "vf_module_id",
-       "vnf-parameter-value": "vCPE_Intrastructure_${suffix}"
-       },
-       {
-       "vnf-parameter-name": "dcae_collector_ip",
-       "vnf-parameter-value": "10.0.4.102"
-       },
-       {
-       "vnf-parameter-name": "dcae_collector_port",
-       "vnf-parameter-value": "8080"
-       },
-       {
-       "vnf-parameter-name": "repo_url_blob",
-       "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
-       },
-       {
-       "vnf-parameter-name": "repo_url_artifacts",
-       "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
-       },
-       {
-       "vnf-parameter-name": "demo_artifacts_version",
-       "vnf-parameter-value": "1.3.0"
-       },
-       {
-       "vnf-parameter-name": "install_script_version",
-       "vnf-parameter-value": "1.3.0"
-       },
-       {
-       "vnf-parameter-name": "key_name",
-       "vnf-parameter-value": "vaaa_key"
-       },
-       {
-       "vnf-parameter-name": "pub_key",
-       "vnf-parameter-value": "${pub_key}"
-       },
-       {
-       "vnf-parameter-name": "cloud_env",
-       "vnf-parameter-value": "openstack"
-       }
-       ],
-       "VNF-API:vnf-assignments": {
-         }
-       }
-     }
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:request-id": "robot12",
+      "VNF-API:notification-url": "https://so.onap.org",
+      "VNF-API:order-number": "robot12",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:request-action": "PreloadVNFRequest",
+      "VNF-API:source": "VID",
+      "VNF-API:order-version": "1.0"
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "https://son.onap.org",
+      "VNF-API:svc-request-id": "robot12"
+    },
+    "VNF-API:vnf-topology-information": {
+      "vnf-topology-identifier": {
+        "service-type": "${service_type}",
+        "vnf-type": "${vnf_type}",
+        "generic-vnf-name": "${generic_vnf_name}",
+        "generic-vnf-type": "${generic_vnf_type}",
+        "vnf-name": "${vnf_name}"
+      },
+      "VNF-API:vnf-parameters": [
+        {
+          "vnf-parameter-name": "vcpe_image_name",
+          "vnf-parameter-value": "ubuntu-16-04-cloud-amd64"
+        },
+        {
+          "vnf-parameter-name": "vcpe_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_net_id",
+          "vnf-parameter-value": "${cpe_signal_net}"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_subnet_id",
+          "vnf-parameter-value": "${cpe_signal_subnet}"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_net_id",
+          "vnf-parameter-value": "${cpe_public_net}"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_subnet_id",
+          "vnf-parameter-value": "${cpe_public_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${oam_onap_net}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${oam_onap_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "cpe_signal_net_cidr",
+          "vnf-parameter-value": "10.4.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_net_cidr",
+          "vnf-parameter-value": "10.2.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "vdhcp_private_ip_0",
+          "vnf-parameter-value": "10.4.0.1"
+        },
+        {
+          "vnf-parameter-name": "vdhcp_private_ip_1",
+          "vnf-parameter-value": "10.0.101.1"
+        },
+        {
+          "vnf-parameter-name": "vaaa_private_ip_0",
+          "vnf-parameter-value": "10.4.0.2"
+        },
+        {
+          "vnf-parameter-name": "vaaa_private_ip_1",
+          "vnf-parameter-value": "10.0.101.2"
+        },
+        {
+          "vnf-parameter-name": "vdns_private_ip_0",
+          "vnf-parameter-value": "10.2.0.1"
+        },
+        {
+          "vnf-parameter-name": "vdns_private_ip_1",
+          "vnf-parameter-value": "10.0.101.3"
+        },
+        {
+          "vnf-parameter-name": "vweb_private_ip_0",
+          "vnf-parameter-value": "10.2.0.10"
+        },
+        {
+          "vnf-parameter-name": "vweb_private_ip_1",
+          "vnf-parameter-value": "10.0.101.40"
+        },
+        {
+          "vnf-parameter-name": "mr_ip_addr",
+          "vnf-parameter-value": "${mr_ip_addr}"
+        },
+        {
+          "vnf-parameter-name": "mr_ip_port",
+          "vnf-parameter-value": "${mr_ip_port}"
+        },
+        {
+          "vnf-parameter-name": "vaaa_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01aaa01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vdns_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01dns01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vdhcp_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01dhcp01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vweb_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01web01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vnf_id",
+          "vnf-parameter-value": "vCPE_Infrastructure_demo_app_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "vf_module_id",
+          "vnf-parameter-value": "vCPE_Intrastructure_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_ip",
+          "vnf-parameter-value": "10.0.4.102"
+        },
+        {
+          "vnf-parameter-name": "dcae_collector_port",
+          "vnf-parameter-value": "8080"
+        },
+        {
+          "vnf-parameter-name": "repo_url_blob",
+          "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+        },
+        {
+          "vnf-parameter-name": "repo_url_artifacts",
+          "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
+        },
+        {
+          "vnf-parameter-name": "demo_artifacts_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "install_script_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "key_name",
+          "vnf-parameter-value": "vaaa_key"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
+        }
+      ],
+      "VNF-API:vnf-assignments": {}
+    }
+  }
 }
-

diff --git a/test/vcpe/preload_templates/template.vcpe_infragra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infragra_vfmodule.json
index 0b076b4..59a6572 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_infragra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_infragra_vfmodule.json
@@ -1,182 +1,182 @@
 {
-       "GENERIC-RESOURCE-API:input": {
-               "GENERIC-RESOURCE-API:request-information": {
-                       "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
-                       "GENERIC-RESOURCE-API:order-number": "robot12",
-                       "GENERIC-RESOURCE-API:order-version": "1.0",
-                       "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
-                       "GENERIC-RESOURCE-API:request-id": "robot12",
-                       "GENERIC-RESOURCE-API:source": "VID"
-               },
-               "GENERIC-RESOURCE-API:sdnc-request-header": {
-                       "GENERIC-RESOURCE-API:svc-action": "reserve",
-                       "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
-                       "GENERIC-RESOURCE-API:svc-request-id": "robot12"
-               },
-               "preload-vf-module-topology-information": {
-                       "vf-module-topology": {
-                               "vf-module-parameters":  {
-                                       "param": [
-                                       {
-                                       "name": "vcpe_image_name",
-                                       "value": "ubuntu-16-04-cloud-amd64"
-                                       },
-                                       {
-                                       "name": "vcpe_flavor_name",
-                                       "value": "m1.medium"
-                                       },
-                                       {
-                                       "name": "public_net_id",
-                                       "value": "${public_net_id}"
-                                       },
-                                       {
-                                       "name": "cpe_signal_net_id",
-                                       "value": "${cpe_signal_net}"
-                                       },
-                                       {
-                                       "name": "cpe_signal_subnet_id",
-                                       "value": "${cpe_signal_subnet}" 
-                                       },
-                                       {
-                                       "name": "cpe_public_net_id",
-                                       "value": "${cpe_public_net}"
-                                       },
-                                       {
-                                       "name": "cpe_public_subnet_id",
-                                       "value": "${cpe_public_subnet}"
-                                       },
-                                       {
-                                       "name": "onap_private_net_id",
-                                       "value": "${oam_onap_net}"
-                                       },
-                                       {
-                                       "name": "onap_private_subnet_id",
-                                       "value": "${oam_onap_subnet}"
-                                       },
-                                       {
-                                       "name": "onap_private_net_cidr",
-                                       "value": "10.0.0.0/16"
-                                       },
-                                       {
-                                       "name": "cpe_signal_net_cidr",
-                                       "value": "10.4.0.0/24"
-                                       },
-                                       {
-                                       "name": "cpe_public_net_cidr",
-                                       "value": "10.2.0.0/24"
-                                       },
-                                       {
-                                       "name": "vdhcp_private_ip_0",
-                                       "value": "10.4.0.1"
-                                       },
-                                       {
-                                       "name": "vdhcp_private_ip_1",
-                                       "value": "10.0.101.1"
-                                       },
-                                       {
-                                       "name": "vaaa_private_ip_0",
-                                       "value": "10.4.0.2"
-                                       },
-                                       {
-                                       "name": "vaaa_private_ip_1",
-                                       "value": "10.0.101.2"
-                                       },
-                                       {
-                                       "name": "vdns_private_ip_0",
-                                       "value": "10.2.0.1"
-                                       },
-                                       {
-                                       "name": "vdns_private_ip_1",
-                                       "value": "10.0.101.3"
-                                       },
-                                       {
-                                       "name": "vweb_private_ip_0",
-                                       "value": "10.2.0.10"
-                                       },
-                                       {
-                                       "name": "vweb_private_ip_1",
-                                       "value": "10.0.101.40"
-                                       },
-                                       {
-                                       "name": "mr_ip_addr",
-                                       "value": "${mr_ip_addr}"
-                                       },
-                                       {
-                                       "name": "mr_ip_port",
-                                       "value": "${mr_ip_port}"
-                                       },
-                                       {
-                                       "name": "vaaa_name_0",
-                                       "value": "zdcpe1cpe01aaa01_${suffix}"
-                                       },
-                                       {
-                                       "name": "vdns_name_0",
-                                       "value": "zdcpe1cpe01dns01_${suffix}"
-                                       },
-                                       {
-                                       "name": "vdhcp_name_0",
-                                       "value": "zdcpe1cpe01dhcp01_${suffix}"
-                                       },
-                                       {
-                                       "name": "vweb_name_0",
-                                       "value": "zdcpe1cpe01web01_${suffix}"
-                                       },
-                                       {
-                                       "name": "vnf_id",
-                                       "value": "vCPE_Infrastructure_demo_app_${suffix}"
-                                       },
-                                       {
-                                       "name": "vf_module_id",
-                                       "value": "vCPE_Intrastructure_${suffix}"
-                                       },
-                                       {
-                                       "name": "dcae_collector_ip",
-                                       "value": "10.0.4.102"
-                                       },
-                                       {
-                                       "name": "dcae_collector_port",
-                                       "value": "8080"
-                                       },
-                                       {
-                                       "name": "repo_url_blob",
-                                       "value": "https://nexus.onap.org/content/sites/raw"
-                                       },
-                                       {
-                                       "name": "repo_url_artifacts",
-                                       "value": "https://nexus.onap.org/content/repositories/releases"
-                                       },
-                                       {
-                                       "name": "demo_artifacts_version",
-                                       "value": "1.3.0"
-                                       },
-                                       {
-                                       "name": "install_script_version",
-                                       "value": "1.3.0"
-                                       },
-                                       {
-                                       "name": "key_name",
-                                       "value": "vaaa_key"
-                                       },
-                                       {
-                                       "name": "pub_key",
-                                       "value": "${pub_key}"
-                                       },
-                                       {
-                                       "name": "cloud_env",
-                                       "value": "openstack"
-                                       }
-
-                               ] },
-                              "vf-module-assignments":  {},
-                               "vf-module-topology-identifier": {
-                                        "vf-module-name": "${vnf_name}"
-                                      }
-                        },
-                        "vnf-resource-assignments": {},
-                        "vnf-topology-identifier-structure": {
-                                       "nf-type": "${vnf_type}",
-                                       "vnf-id": "${vnf_name}"
-                               }
-                         }
+  "GENERIC-RESOURCE-API:input": {
+    "GENERIC-RESOURCE-API:request-information": {
+      "GENERIC-RESOURCE-API:notification-url": "https://so.onap.org",
+      "GENERIC-RESOURCE-API:order-number": "robot12",
+      "GENERIC-RESOURCE-API:order-version": "1.0",
+      "GENERIC-RESOURCE-API:request-action": "PreloadVfModuleRequest",
+      "GENERIC-RESOURCE-API:request-id": "robot12",
+      "GENERIC-RESOURCE-API:source": "VID"
+    },
+    "GENERIC-RESOURCE-API:sdnc-request-header": {
+      "GENERIC-RESOURCE-API:svc-action": "reserve",
+      "GENERIC-RESOURCE-API:svc-notification-url": "https://son.onap.org",
+      "GENERIC-RESOURCE-API:svc-request-id": "robot12"
+    },
+    "preload-vf-module-topology-information": {
+      "vf-module-topology": {
+        "vf-module-parameters": {
+          "param": [
+            {
+              "name": "vcpe_image_name",
+              "value": "ubuntu-16-04-cloud-amd64"
+            },
+            {
+              "name": "vcpe_flavor_name",
+              "value": "m1.medium"
+            },
+            {
+              "name": "public_net_id",
+              "value": "${public_net_id}"
+            },
+            {
+              "name": "cpe_signal_net_id",
+              "value": "${cpe_signal_net}"
+            },
+            {
+              "name": "cpe_signal_subnet_id",
+              "value": "${cpe_signal_subnet}"
+            },
+            {
+              "name": "cpe_public_net_id",
+              "value": "${cpe_public_net}"
+            },
+            {
+              "name": "cpe_public_subnet_id",
+              "value": "${cpe_public_subnet}"
+            },
+            {
+              "name": "onap_private_net_id",
+              "value": "${oam_onap_net}"
+            },
+            {
+              "name": "onap_private_subnet_id",
+              "value": "${oam_onap_subnet}"
+            },
+            {
+              "name": "onap_private_net_cidr",
+              "value": "10.0.0.0/16"
+            },
+            {
+              "name": "cpe_signal_net_cidr",
+              "value": "10.4.0.0/24"
+            },
+            {
+              "name": "cpe_public_net_cidr",
+              "value": "10.2.0.0/24"
+            },
+            {
+              "name": "vdhcp_private_ip_0",
+              "value": "10.4.0.1"
+            },
+            {
+              "name": "vdhcp_private_ip_1",
+              "value": "10.0.101.1"
+            },
+            {
+              "name": "vaaa_private_ip_0",
+              "value": "10.4.0.2"
+            },
+            {
+              "name": "vaaa_private_ip_1",
+              "value": "10.0.101.2"
+            },
+            {
+              "name": "vdns_private_ip_0",
+              "value": "10.2.0.1"
+            },
+            {
+              "name": "vdns_private_ip_1",
+              "value": "10.0.101.3"
+            },
+            {
+              "name": "vweb_private_ip_0",
+              "value": "10.2.0.10"
+            },
+            {
+              "name": "vweb_private_ip_1",
+              "value": "10.0.101.40"
+            },
+            {
+              "name": "mr_ip_addr",
+              "value": "${mr_ip_addr}"
+            },
+            {
+              "name": "mr_ip_port",
+              "value": "${mr_ip_port}"
+            },
+            {
+              "name": "vaaa_name_0",
+              "value": "zdcpe1cpe01aaa01_${suffix}"
+            },
+            {
+              "name": "vdns_name_0",
+              "value": "zdcpe1cpe01dns01_${suffix}"
+            },
+            {
+              "name": "vdhcp_name_0",
+              "value": "zdcpe1cpe01dhcp01_${suffix}"
+            },
+            {
+              "name": "vweb_name_0",
+              "value": "zdcpe1cpe01web01_${suffix}"
+            },
+            {
+              "name": "vnf_id",
+              "value": "vCPE_Infrastructure_demo_app_${suffix}"
+            },
+            {
+              "name": "vf_module_id",
+              "value": "vCPE_Intrastructure_${suffix}"
+            },
+            {
+              "name": "dcae_collector_ip",
+              "value": "10.0.4.102"
+            },
+            {
+              "name": "dcae_collector_port",
+              "value": "8080"
+            },
+            {
+              "name": "repo_url_blob",
+              "value": "https://nexus.onap.org/content/sites/raw"
+            },
+            {
+              "name": "repo_url_artifacts",
+              "value": "https://nexus.onap.org/content/repositories/releases"
+            },
+            {
+              "name": "demo_artifacts_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "install_script_version",
+              "value": "1.3.0"
+            },
+            {
+              "name": "key_name",
+              "value": "vaaa_key"
+            },
+            {
+              "name": "pub_key",
+              "value": "${pub_key}"
+            },
+            {
+              "name": "cloud_env",
+              "value": "openstack"
+            }
+          ]
+        },
+        "vf-module-assignments": {},
+        "vf-module-topology-identifier": {
+          "vf-module-name": "${vnf_name}"
+        }
+      },
+      "vnf-resource-assignments": {},
+      "vnf-topology-identifier-structure": {
+        "nf-type": "${vnf_type}",
+        "vnf-id": "${vnf_name}"
       }
+    }
+  }
 }

diff --git a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
index bd288b4..4b660d1 100644 (file)
--- a/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_vgw_vfmodule.json
@@ -1,130 +1,130 @@
 {
-    "VNF-API:input": {
-        "VNF-API:request-information": {
-            "VNF-API:notification-url": "https://so.onap.org", 
-            "VNF-API:order-number": "robot12", 
-            "VNF-API:order-version": "1.0", 
-            "VNF-API:request-action": "PreloadVNFRequest", 
-            "VNF-API:request-id": "robot12", 
-            "VNF-API:request-sub-action": "SUPP", 
-            "VNF-API:source": "VID"
-        }, 
-        "VNF-API:sdnc-request-header": {
-            "VNF-API:svc-action": "reserve", 
-            "VNF-API:svc-notification-url": "https://son.onap.org", 
-            "VNF-API:svc-request-id": "robot12"
-        }, 
-        "VNF-API:vnf-topology-information": {
-            "VNF-API:vnf-assignments": {}, 
-            "VNF-API:vnf-parameters": [
-                {
-                    "vnf-parameter-name": "vcpe_image_name", 
-                    "vnf-parameter-value": "vgw-casa-base-ubuntu-16-04"
-                }, 
-                {
-                    "vnf-parameter-name": "vcpe_flavor_name", 
-                    "vnf-parameter-value": "m1.medium"
-                }, 
-                {
-                    "vnf-parameter-name": "public_net_id", 
-                    "vnf-parameter-value": "${public_net_id}"
-                }, 
-                {
-                    "vnf-parameter-name": "mux_gw_private_net_id", 
-                    "vnf-parameter-value": "${mux_gw_net}"
-                }, 
-                {
-                    "vnf-parameter-name": "mux_gw_private_subnet_id", 
-                    "vnf-parameter-value": "${mux_gw_subnet}"
-                }, 
-                {
-                    "vnf-parameter-name": "mux_gw_private_net_cidr", 
-                    "vnf-parameter-value": "10.5.0.0/24"
-                }, 
-                {
-                    "vnf-parameter-name": "cpe_public_net_id", 
-                    "vnf-parameter-value": "${cpe_public_net}"
-                }, 
-                {
-                    "vnf-parameter-name": "cpe_public_subnet_id", 
-                    "vnf-parameter-value": "${cpe_public_subnet}"
-                }, 
-                {
-                    "vnf-parameter-name": "cpe_public_net_cidr", 
-                    "vnf-parameter-value": "10.2.0.0/24"
-                }, 
-                {
-                    "vnf-parameter-name": "vgw_private_ip_0", 
-                    "vnf-parameter-value": "10.5.0.126"
-                }, 
-                {
-                    "vnf-parameter-name": "vgw_private_ip_1", 
-                    "vnf-parameter-value": "10.0.101.126"
-                }, 
-                {
-                    "vnf-parameter-name": "vgw_private_ip_2", 
-                    "vnf-parameter-value": "10.2.0.41"
-                }, 
-                {
-                    "vnf-parameter-name": "vgw_name_0", 
-                    "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}"
-                }, 
-                {
-                    "vnf-parameter-name": "mux_ip_addr", 
-                    "vnf-parameter-value": "10.5.0.21"
-                }, 
-                {
-                    "vnf-parameter-name": "vg_vgmux_tunnel_vni", 
-                    "vnf-parameter-value": "126"
-                }, 
-                {
-                    "vnf-parameter-name": "onap_private_net_id", 
-                    "vnf-parameter-value": "${oam_onap_net}"
-                }, 
-                {
-                    "vnf-parameter-name": "onap_private_subnet_id", 
-                    "vnf-parameter-value": "${oam_onap_subnet}"
-                }, 
-                {
-                    "vnf-parameter-name": "onap_private_net_cidr", 
-                    "vnf-parameter-value": "10.0.0.0/16"
-                }, 
-                {
-                    "vnf-parameter-name": "repo_url_blob", 
-                    "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
-                }, 
-                {
-                    "vnf-parameter-name": "repo_url_artifacts", 
-                    "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
-                }, 
-                {
-                    "vnf-parameter-name": "demo_artifacts_version", 
-                    "vnf-parameter-value": "1.1.1"
-                }, 
-                {
-                    "vnf-parameter-name": "script_version", 
-                    "vnf-parameter-value": "1.3.0"
-                }, 
-                {
-                    "vnf-parameter-name": "key_name", 
-                    "vnf-parameter-value": "vgw_key"
-                }, 
-                {
-                    "vnf-parameter-name": "pub_key", 
-                    "vnf-parameter-value": "${pub_key}"
-                }, 
-                {
-                    "vnf-parameter-name": "cloud_env", 
-                    "vnf-parameter-value": "openstack"
-                }
-            ], 
-            "vnf-topology-identifier": {
-                "generic-vnf-name": "GENERIC-VGW-VNF-NAME0", 
-                "generic-vnf-type": "GENERIC-VGW-VNF-TYPE", 
-                "service-type": "VGW-SERVICE-TYPE", 
-                "vnf-name": "VGW2BRG-${brg_mac}", 
-                "vnf-type": "VGW-VNF-TYPE"
-            }
+  "VNF-API:input": {
+    "VNF-API:request-information": {
+      "VNF-API:notification-url": "https://so.onap.org",
+      "VNF-API:order-number": "robot12",
+      "VNF-API:order-version": "1.0",
+      "VNF-API:request-action": "PreloadVNFRequest",
+      "VNF-API:request-id": "robot12",
+      "VNF-API:request-sub-action": "SUPP",
+      "VNF-API:source": "VID"
+    },
+    "VNF-API:sdnc-request-header": {
+      "VNF-API:svc-action": "reserve",
+      "VNF-API:svc-notification-url": "https://son.onap.org",
+      "VNF-API:svc-request-id": "robot12"
+    },
+    "VNF-API:vnf-topology-information": {
+      "VNF-API:vnf-assignments": {},
+      "VNF-API:vnf-parameters": [
+        {
+          "vnf-parameter-name": "vcpe_image_name",
+          "vnf-parameter-value": "vgw-casa-base-ubuntu-16-04"
+        },
+        {
+          "vnf-parameter-name": "vcpe_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_net_id",
+          "vnf-parameter-value": "${mux_gw_net}"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_subnet_id",
+          "vnf-parameter-value": "${mux_gw_subnet}"
+        },
+        {
+          "vnf-parameter-name": "mux_gw_private_net_cidr",
+          "vnf-parameter-value": "10.5.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_net_id",
+          "vnf-parameter-value": "${cpe_public_net}"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_subnet_id",
+          "vnf-parameter-value": "${cpe_public_subnet}"
+        },
+        {
+          "vnf-parameter-name": "cpe_public_net_cidr",
+          "vnf-parameter-value": "10.2.0.0/24"
+        },
+        {
+          "vnf-parameter-name": "vgw_private_ip_0",
+          "vnf-parameter-value": "10.5.0.126"
+        },
+        {
+          "vnf-parameter-name": "vgw_private_ip_1",
+          "vnf-parameter-value": "10.0.101.126"
+        },
+        {
+          "vnf-parameter-name": "vgw_private_ip_2",
+          "vnf-parameter-value": "10.2.0.41"
+        },
+        {
+          "vnf-parameter-name": "vgw_name_0",
+          "vnf-parameter-value": "zdcpe1cpe01gw01_${suffix}"
+        },
+        {
+          "vnf-parameter-name": "mux_ip_addr",
+          "vnf-parameter-value": "10.5.0.21"
+        },
+        {
+          "vnf-parameter-name": "vg_vgmux_tunnel_vni",
+          "vnf-parameter-value": "126"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${oam_onap_net}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${oam_onap_subnet}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "repo_url_blob",
+          "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw"
+        },
+        {
+          "vnf-parameter-name": "repo_url_artifacts",
+          "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases"
+        },
+        {
+          "vnf-parameter-name": "demo_artifacts_version",
+          "vnf-parameter-value": "1.1.1"
+        },
+        {
+          "vnf-parameter-name": "script_version",
+          "vnf-parameter-value": "1.3.0"
+        },
+        {
+          "vnf-parameter-name": "key_name",
+          "vnf-parameter-value": "vgw_key"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
         }
+      ],
+      "vnf-topology-identifier": {
+        "generic-vnf-name": "GENERIC-VGW-VNF-NAME0",
+        "generic-vnf-type": "GENERIC-VGW-VNF-TYPE",
+        "service-type": "VGW-SERVICE-TYPE",
+        "vnf-name": "VGW2BRG-${brg_mac}",
+        "vnf-type": "VGW-VNF-TYPE"
+      }
     }
-}
\ No newline at end of file
+  }
+}

diff --git a/test/vcpe/preload_templates/template_sniro_data.json b/test/vcpe/preload_templates/template_sniro_data.json
index c2c6421..952a42b 100644 (file)
--- a/test/vcpe/preload_templates/template_sniro_data.json
+++ b/test/vcpe/preload_templates/template_sniro_data.json
@@ -1,37 +1,64 @@
 {
-   "solutionInfo" : {
-      "placementInfo" : [
-         {
-            "cloudRegionId" : "RegionOne",
-            "inventoryType" : "service",
-            "resourceModuleName" : "${tunnelxconn_ar_name}",
-            "serviceInstanceId" : "${vgmux_svc_instance_uuid}",
-            "serviceResourceId" : "TUNNEL-RESOURCE-ID-REPLACE",
-            "isRehome" : "False",
-                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
-         },
-         {
-            "cloudRegionId" : "RegionOne",
-            "inventoryType" : "cloud",
-            "resourceModuleName" : "${vgw_name}",
-            "serviceInstanceId" : "vG-service-instance-id",
-            "serviceResourceId" : "VGW-RESOURCE-ID-REPLACE",
-            "isRehome" : "False",
-                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
-         },
-         {
-            "cloudRegionId" : "RegionOne",
-            "inventoryType" : "service",
-            "resourceModuleName" : "${brg_ar_name}",
-            "serviceInstanceId" : "${vbrg_svc_instance_uuid}",
-            "serviceResourceId" : "BRG-RESOURCE-ID-REPLACE",
-            "isRehome" : "False",
-                       "assignmentInfo": [ { "variableName": "cloudOwner", "variableValue": "CloudOwner"}, {"variableName": "vnfHostName", "variableValue": "vnfHostName" }] 
-         }
-      ]
-   },
-   "requestId" : "111-111-1111",
-   "statusMessage" : "",
-   "transactionId" : "111-111-1111",
-   "requestState" : "complete"
+  "solutionInfo": {
+    "placementInfo": [
+      {
+        "cloudRegionId": "RegionOne",
+        "inventoryType": "service",
+        "resourceModuleName": "${tunnelxconn_ar_name}",
+        "serviceInstanceId": "${vgmux_svc_instance_uuid}",
+        "serviceResourceId": "TUNNEL-RESOURCE-ID-REPLACE",
+        "isRehome": "False",
+        "assignmentInfo": [
+          {
+            "variableName": "cloudOwner",
+            "variableValue": "CloudOwner"
+          },
+          {
+            "variableName": "vnfHostName",
+            "variableValue": "vnfHostName"
+          }
+        ]
+      },
+      {
+        "cloudRegionId": "RegionOne",
+        "inventoryType": "cloud",
+        "resourceModuleName": "${vgw_name}",
+        "serviceInstanceId": "vG-service-instance-id",
+        "serviceResourceId": "VGW-RESOURCE-ID-REPLACE",
+        "isRehome": "False",
+        "assignmentInfo": [
+          {
+            "variableName": "cloudOwner",
+            "variableValue": "CloudOwner"
+          },
+          {
+            "variableName": "vnfHostName",
+            "variableValue": "vnfHostName"
+          }
+        ]
+      },
+      {
+        "cloudRegionId": "RegionOne",
+        "inventoryType": "service",
+        "resourceModuleName": "${brg_ar_name}",
+        "serviceInstanceId": "${vbrg_svc_instance_uuid}",
+        "serviceResourceId": "BRG-RESOURCE-ID-REPLACE",
+        "isRehome": "False",
+        "assignmentInfo": [
+          {
+            "variableName": "cloudOwner",
+            "variableValue": "CloudOwner"
+          },
+          {
+            "variableName": "vnfHostName",
+            "variableValue": "vnfHostName"
+          }
+        ]
+      }
+    ]
+  },
+  "requestId": "111-111-1111",
+  "statusMessage": "",
+  "transactionId": "111-111-1111",
+  "requestState": "complete"
 }

diff --git a/test/vcpe/preload_templates/template_sniro_request.json b/test/vcpe/preload_templates/template_sniro_request.json
index 6fdbb70..33ff427 100644 (file)
--- a/test/vcpe/preload_templates/template_sniro_request.json
+++ b/test/vcpe/preload_templates/template_sniro_request.json
@@ -1,20 +1,20 @@
 {
-  "request" : {
-    "urlPath" : "/sniro/api/v2/placement",
-    "method" : "POST"
+  "request": {
+    "urlPath": "/sniro/api/v2/placement",
+    "method": "POST"
   },
-  "response" : {
-    "status" : "202",
+  "response": {
+    "status": "202",
     "body": "{\"requestId\": \"1111-111-11\"}"
   },
-  "postServeActions" : {
-    "webhook" : {
-      "headers" : {
-        "Content-Type" : "application/json"
+  "postServeActions": {
+    "webhook": {
+      "headers": {
+        "Content-Type": "application/json"
       },
-      "method" : "POST",
-      "base64Body" : "${base64_sniro_data}",
-      "url" : " http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SNIROResponse"
+      "method": "POST",
+      "base64Body": "${base64_sniro_data}",
+      "url": " http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SNIROResponse"
     }
   }
 }