Fix json format issues

Issue-ID: INT-1478

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ia5cb9866e7f6a7af45a361ba1d7c1722220054c3
Signed-off-by: mrichomme <morgan.richomme@orange.com>

4 files changed, 598 insertions, 603 deletions

diff --git a/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json
index 2792cfde..a0f14a3b 100644
--- a/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json
+++ b/robot/assets/templates/vcpeutils/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/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json
index 2630ee7a..cf788886 100644
--- a/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json
+++ b/robot/assets/templates/vcpeutils/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/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json
index a1ebf2ad..ad0f9184 100644
--- a/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json
+++ b/robot/assets/templates/vcpeutils/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/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json b/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json
index d456a105..6081ad2c 100644
--- a/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json
+++ b/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json
@@ -1,143 +1,142 @@
 {
-   "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": "unprotected_private_net_id" ,
-	   "vnf-parameter-value" : "demofwl_unprotected"
-   },
-   {
-	   "vnf-parameter-name": "unprotected_private_net_cidr" ,
-	   "vnf-parameter-value" : "192.168.110.0/24"
-   },
-   {
-	   "vnf-parameter-name": "protected_private_net_id" ,
-	   "vnf-parameter-value" : "demofwl_protected"
-   },
-   {
-	   "vnf-parameter-name": "protected_private_net_cidr" ,
-	   "vnf-parameter-value" : "192.168.120.0/24"
-   },
-   {
-	   "vnf-parameter-name": "vfw_int_unprotected_private_ip_0" ,
-	   "vnf-parameter-value" : "192.168.110.100"
-   },
-   {
-	   "vnf-parameter-name": "vfw_int_protected_private_ip_0" ,
-	   "vnf-parameter-value" : "192.168.120.100"
-   },
-   {
-	   "vnf-parameter-name": "vfw_onap_private_ip_0" ,
-	   "vnf-parameter-value" : "10.0.${ecompnet}.11"
-   },
-   {
-	   "vnf-parameter-name": "vpg_int_unprotected_private_ip_0" ,
-	   "vnf-parameter-value" : "192.168.110.200"
-   },
-   {
-	   "vnf-parameter-name": "vfw_int_protected_private_floating_ip" ,
-	   "vnf-parameter-value" : "192.168.110.200"
-   },
-   {
-	   "vnf-parameter-name": "vpg_onap_private_ip_0" ,
-	   "vnf-parameter-value" : "10.0.${ecompnet}.12"
-   },
-   {
-	   "vnf-parameter-name": "vsn_int_protected_private_ip_0" ,
-	   "vnf-parameter-value" : "192.168.120.250"
-   },
-   {
-	   "vnf-parameter-name": "vsn_onap_private_ip_0" ,
-	   "vnf-parameter-value" : "10.0.${ecompnet}.13"
-   },
-   {
-	   "vnf-parameter-name": "sec_group" ,
-	   "vnf-parameter-value" : "${sec_group}"
-   },
-   {
-	   "vnf-parameter-name": "vfw_name_0",
-	   "vnf-parameter-value" :"demofwl01fwl"
-   },
-   {
-	   "vnf-parameter-name": "vpg_name_0",
-	   "vnf-parameter-value" : "demofwl01pgn"
-   },
-   {
-	   "vnf-parameter-name": "vsn_name_0",
-	   "vnf-parameter-value": "demofwl01snk"
-   },
-   {
-	"vnf-parameter-name": "vfw_image_name",
-	"vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
-	},
-	{
-	"vnf-parameter-name": "vfw_flavor_name",
-	"vnf-parameter-value": "m1.medium"
-	},
-	{
-	"vnf-parameter-name": "vpg_image_name",
-	"vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
-	},
-	{
-	"vnf-parameter-name": "vpg_flavor_name",
-	"vnf-parameter-value": "m1.medium"
-	},
-	{
-	"vnf-parameter-name": "vsn_image_name",
-	"vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
-	},
-	{
-	"vnf-parameter-name": "vsn_flavor_name",
-	"vnf-parameter-value": "m1.medium"
-	},
-	{
-	"vnf-parameter-name": "public_net_id",
-	"vnf-parameter-value": "${public_net_id}"
-	},
-	{
-	"vnf-parameter-name": "onap_private_net_id",
-	"vnf-parameter-value": "${onap_private_net_id}"
-	},
-	{
-	"vnf-parameter-name": "onap_private_subnet_id",
-	"vnf-parameter-value": "${onap_private_subnet_id}"
-	},
-	{
-	"vnf-parameter-name": "onap_private_net_cidr",
-	"vnf-parameter-value": "10.0.0.0/16"
-	},
-	{
-	"vnf-parameter-name": "cloud_env",
-	"vnf-parameter-value": "openstack"
-	},
-	{
-	"vnf-parameter-name": "pub_key",
-        "vnf-parameter-value": "${pub_key}"
-	}
-       ],
-       "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": "unprotected_private_net_id",
+          "vnf-parameter-value": "demofwl_unprotected"
+        },
+        {
+          "vnf-parameter-name": "unprotected_private_net_cidr",
+          "vnf-parameter-value": "192.168.110.0/24"
+        },
+        {
+          "vnf-parameter-name": "protected_private_net_id",
+          "vnf-parameter-value": "demofwl_protected"
+        },
+        {
+          "vnf-parameter-name": "protected_private_net_cidr",
+          "vnf-parameter-value": "192.168.120.0/24"
+        },
+        {
+          "vnf-parameter-name": "vfw_int_unprotected_private_ip_0",
+          "vnf-parameter-value": "192.168.110.100"
+        },
+        {
+          "vnf-parameter-name": "vfw_int_protected_private_ip_0",
+          "vnf-parameter-value": "192.168.120.100"
+        },
+        {
+          "vnf-parameter-name": "vfw_onap_private_ip_0",
+          "vnf-parameter-value": "10.0.${ecompnet}.11"
+        },
+        {
+          "vnf-parameter-name": "vpg_int_unprotected_private_ip_0",
+          "vnf-parameter-value": "192.168.110.200"
+        },
+        {
+          "vnf-parameter-name": "vfw_int_protected_private_floating_ip",
+          "vnf-parameter-value": "192.168.110.200"
+        },
+        {
+          "vnf-parameter-name": "vpg_onap_private_ip_0",
+          "vnf-parameter-value": "10.0.${ecompnet}.12"
+        },
+        {
+          "vnf-parameter-name": "vsn_int_protected_private_ip_0",
+          "vnf-parameter-value": "192.168.120.250"
+        },
+        {
+          "vnf-parameter-name": "vsn_onap_private_ip_0",
+          "vnf-parameter-value": "10.0.${ecompnet}.13"
+        },
+        {
+          "vnf-parameter-name": "sec_group",
+          "vnf-parameter-value": "${sec_group}"
+        },
+        {
+          "vnf-parameter-name": "vfw_name_0",
+          "vnf-parameter-value": "demofwl01fwl"
+        },
+        {
+          "vnf-parameter-name": "vpg_name_0",
+          "vnf-parameter-value": "demofwl01pgn"
+        },
+        {
+          "vnf-parameter-name": "vsn_name_0",
+          "vnf-parameter-value": "demofwl01snk"
+        },
+        {
+          "vnf-parameter-name": "vfw_image_name",
+          "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
+        },
+        {
+          "vnf-parameter-name": "vfw_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "vpg_image_name",
+          "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
+        },
+        {
+          "vnf-parameter-name": "vpg_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "vsn_image_name",
+          "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}"
+        },
+        {
+          "vnf-parameter-name": "vsn_flavor_name",
+          "vnf-parameter-value": "m1.medium"
+        },
+        {
+          "vnf-parameter-name": "public_net_id",
+          "vnf-parameter-value": "${public_net_id}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_id",
+          "vnf-parameter-value": "${onap_private_net_id}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_subnet_id",
+          "vnf-parameter-value": "${onap_private_subnet_id}"
+        },
+        {
+          "vnf-parameter-name": "onap_private_net_cidr",
+          "vnf-parameter-value": "10.0.0.0/16"
+        },
+        {
+          "vnf-parameter-name": "cloud_env",
+          "vnf-parameter-value": "openstack"
+        },
+        {
+          "vnf-parameter-name": "pub_key",
+          "vnf-parameter-value": "${pub_key}"
+        }
+      ],
+      "VNF-API:vnf-assignments": {}
+    }
+  }
 }