Fix JSON files linter issues in test/hpa_automation

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

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

3 files changed, 509 insertions, 572 deletions

diff --git a/test/hpa_automation/heat/hpa_automation_config.json b/test/hpa_automation/heat/hpa_automation_config.json
index 9587ffd42..3142557fa 100755
--- a/test/hpa_automation/heat/hpa_automation_config.json
+++ b/test/hpa_automation/heat/hpa_automation_config.json
@@ -1,192 +1,165 @@
 {
-
-"open_cli_product" : "onap-elalto",
-"open_cli_home" : "/opt/oclip",
-"aai_url" : "https://10.12.5.110:30233",
-"aai_username" : "AAI",
-"aai_password" : "AAI",
-"sdc_onboarding_url" : "https://10.12.5.110:30207/sdc1/feProxy",
-"sdc_catalog_url" : "https://10.12.5.110:30204",
-"sdc_password" : "demo123456!",
-"sdc_creator" : "cs0008",
-"sdc_tester" : "jm0007",
-"sdc_governor" : "gv0001",
-"sdc_operator" : "op0001",
-"csar-file-path" : "/root/vfw_hpa.zip",
-"sdnc_url" : "https://10.12.5.110:30267",
-"sdnc_user" : "admin",
-"sdnc_password" : "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
-"sdnc_preload_file" : "/root/integration/test/hpa_automation/heat/sample_vfw_hpa_preload.txt",
-"so_url" : "http://10.12.5.110:30277",
-"so_username" : "InfraPortalClient",
-"so_password" : "password1$",
-"mariadb_host" : "10.42.8.3",
-"so_mariadb_user" : "root",
-"so_mariadb_password" : "secretpassword",
-"so_mariadb_db" : "catalogdb",
-"multicloud_url" : "http://10.12.5.110:30280",
-"policy_url" : "https://10.12.5.110:30694",
-"policy_username" : "testpdp",
-"policy_password" : "alpha123",
-"policy_directory" : "/root/integration/test/hpa_automation/heat/sample_vfw_policies",
-"policy_scope" : "OSDF_DUBLIN",
-"policy_onapName" : "SampleDemo",
-"policy_config_type": "MicroService",
-"policy_pdp_group" : "default",
-"policy_db_ip" : "10.42.10.14",
-"policy_db_user" : "root",
-"policy_db_password" : "secret",
-"//" : "Put in a temp resource module name, should be the same in policy files, script will replace it in policies",
-"temp_resource_module_name" : "resource_name",
-
-"//" : "#Parameters required to create cloud complex",
-"complex_name" : "clli1",
-"street1" : "street1",
-"street2" : "street2",
-"physical_location" : "phy_type",
-"data_center_code" : "code1",
-"latitude" : "32.89948",
-"longitude" : "97.045443",
-"lata" : "example-lata-val-28399",
-"elevation" : "example-elevation-val-28399",
-"region" : "northwest",
-"state" : "oregon",
-"city" : "hillsboro",
-"postal-code" : "00000",
-"country" : "USA",
-"identity_url" : "example-identity-url-val-56898",
-
-"//" : "#Dictionary containing cloud regions and their Parameters",
-
-
- "cloud_region_data":{
-        "ONAP-POD-01-Rail-04":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"8c85ce1f-aa78-45bf-8d6f-4b62784e9bc7",
-             "service-url": "http://10.12.11.1:5000/v3",
-             "user-name":"PUT IN OPENSTACK USERNAME",
-             "password":"PUT IN OPENSTACK PASSWORD",
-             "system-type": "VIM",
-             "ssl-insecure":true,
-             "cloud-domain":"Default",
-             "default-tenant":"Integration-HPA",
-             "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-             "cloud-type" : "openstack",
-             "identity-url": "WillBeUpdatedByMultiCloud",
-             "system-status":"active"
-        },
-        "ONAP-POD-01-Rail-05":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-aa78-44bf-8d6f-4b62784e9bc7",
-             "service-url": "http://10.12.11.1:5000/v3",
-             "user-name":"PUT IN OPENSTACK USERNAME",
-             "password":"PUT IN OPENSTACK PASSWORD",
-             "system-type": "VIM",
-             "ssl-insecure":true,
-             "cloud-domain":"Default",
-             "default-tenant":"Integration-HPA",
-             "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-             "cloud-type" : "openstack",
-             "identity-url": "WillBeUpdatedByMultiCloud",
-             "system-status":"active"
-        },
-
-        "ONAP-POD-01-Rail-06":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-ab77-4ebf-8d6f-4b62773e9bc7",
-             "service-url": "http://10.12.11.1:5000/v3",
-             "user-name":"PUT IN OPENSTACK USERNAME",
-             "password":"PUT IN OPENSTACK PASSWORD",
-             "system-type": "VIM",
-             "ssl-insecure":true,
-             "cloud-domain":"Default",
-             "default-tenant":"Integration-HPA",
-             "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-             "cloud-type" : "openstack",
-             "identity-url": "WillBeUpdatedByMultiCloud",
-             "system-status":"active"
-        },
-
-        "ONAP-POD-01-Rail-07":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
-             "service-url": "http://10.12.11.1:5000/v3",
-             "user-name":"PUT IN OPENSTACK USERNAME",
-             "password":"PUT IN OPENSTACK PASSWORD",
-             "system-type": "VIM",
-             "ssl-insecure":true,
-             "cloud-domain":"Default",
-             "default-tenant":"Integration-HPA",
-             "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-             "cloud-type" : "openstack",
-             "identity-url": "WillBeUpdatedByMultiCloud",
-             "system-status":"active"
-        }
-        },
-
-
-"//" : "#Parameters to register cloud region",
-"cloud-owner" : "CloudOwner",
-"owner-defined-type" : "t1",
-"cloud-zone" : "CloudZone",
-
-"service_name" : "vFW",
-"customer_name" : "hpa_cust",
-"subscriber_name" : "hpa_cust",
-
-"//" : "Onboarding parameters",
-"vendor-name" : "hpa-vendor",
-"entitlement-pool-name" : "hpa-pool",
-"start-date" : "10/08/2019",
-"expiry-date" : "12/31/2040",
-"key-group-name" : "hpa-key",
-"key-group-type" : "Universal",
-"feature-grp-name" : "hpa-feature",
-"part-no" : "hpa-part",
-"agreement-name" : "hpa-agreement",
-
-"onboarding-method" : "NetworkPackage",
-"vsp-name" : "hpa-vsp",
-"vsp-desc" : "hpa-vsp-desc",
-"vsp-version" : "1.0",
-
-"vf-name" : "hpa-vf",
-"vf-description" : "hpa-vf",
-"vf-remarks" :"remarkss",
-"vf-version" : "1.0",
-
-"//" : "Be sure to include single quotes in parameters that have spaces",
-"project-code" : "000000",
-"service-model-name" : "vfw-hpa",
-"service-model-desc" : "'hpa service model'",
-"icon-id" : "network_l_1-3",
-"category-display" : "'Network L1-3'",
-"category" : "'network l1-3'",
-
-"service-test-remarks" : "test",
-"service-accept-remarks" : "accepted",
-"service-approve-remarks" : "approved",
-
-
-"//" : "service instance parameters",
-"instance-name" : "hpa-instance",
-"requestor-id" : "demo",
-"customer-latitude":"32.897480",
-"customer-longitude":"97.040443",
-"company-name":"some_company",
-"homing-solution" : "oof",
-"orchestrator"  : "multicloud",
-"owning-entity-name":"OE-Demonstration",
-"projectName" : "Project-Demonstration",
-"a-la-carte" : true,
-"test-api" : "VNF_API",
-
-"//" : "vnf parameters",
-"platform-name" : "Platform-Demonstration",
-"lob-name" : "LOB-Demonstration",
-"generic-vnf-name"  : "vfw-hpa-vnf",
-
-"vf-module-name" : "vfw-sriov-cli",
-"supress-rollback" : "false",
-"use-preload" : "true"
+  "open_cli_product": "onap-elalto",
+  "open_cli_home": "/opt/oclip",
+  "aai_url": "https://10.12.5.110:30233",
+  "aai_username": "AAI",
+  "aai_password": "AAI",
+  "sdc_onboarding_url": "https://10.12.5.110:30207/sdc1/feProxy",
+  "sdc_catalog_url": "https://10.12.5.110:30204",
+  "sdc_password": "demo123456!",
+  "sdc_creator": "cs0008",
+  "sdc_tester": "jm0007",
+  "sdc_governor": "gv0001",
+  "sdc_operator": "op0001",
+  "csar-file-path": "/root/vfw_hpa.zip",
+  "sdnc_url": "https://10.12.5.110:30267",
+  "sdnc_user": "admin",
+  "sdnc_password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
+  "sdnc_preload_file": "/root/integration/test/hpa_automation/heat/sample_vfw_hpa_preload.txt",
+  "so_url": "http://10.12.5.110:30277",
+  "so_username": "InfraPortalClient",
+  "so_password": "password1$",
+  "mariadb_host": "10.42.8.3",
+  "so_mariadb_user": "root",
+  "so_mariadb_password": "secretpassword",
+  "so_mariadb_db": "catalogdb",
+  "multicloud_url": "http://10.12.5.110:30280",
+  "policy_url": "https://10.12.5.110:30694",
+  "policy_username": "testpdp",
+  "policy_password": "alpha123",
+  "policy_directory": "/root/integration/test/hpa_automation/heat/sample_vfw_policies",
+  "policy_scope": "OSDF_DUBLIN",
+  "policy_onapName": "SampleDemo",
+  "policy_config_type": "MicroService",
+  "policy_pdp_group": "default",
+  "policy_db_ip": "10.42.10.14",
+  "policy_db_user": "root",
+  "policy_db_password": "secret",
+  "temp_resource_module_name": "resource_name",
+  "complex_name": "clli1",
+  "street1": "street1",
+  "street2": "street2",
+  "physical_location": "phy_type",
+  "data_center_code": "code1",
+  "latitude": "32.89948",
+  "longitude": "97.045443",
+  "lata": "example-lata-val-28399",
+  "elevation": "example-elevation-val-28399",
+  "region": "northwest",
+  "state": "oregon",
+  "city": "hillsboro",
+  "postal-code": "00000",
+  "country": "USA",
+  "identity_url": "example-identity-url-val-56898",
+  "cloud_region_data": {
+    "ONAP-POD-01-Rail-04": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "8c85ce1f-aa78-45bf-8d6f-4b62784e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "PUT IN OPENSTACK USERNAME",
+      "password": "PUT IN OPENSTACK PASSWORD",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    },
+    "ONAP-POD-01-Rail-05": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-aa78-44bf-8d6f-4b62784e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "PUT IN OPENSTACK USERNAME",
+      "password": "PUT IN OPENSTACK PASSWORD",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    },
+    "ONAP-POD-01-Rail-06": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-ab77-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "PUT IN OPENSTACK USERNAME",
+      "password": "PUT IN OPENSTACK PASSWORD",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    },
+    "ONAP-POD-01-Rail-07": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "PUT IN OPENSTACK USERNAME",
+      "password": "PUT IN OPENSTACK PASSWORD",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    }
+  },
+  "cloud-owner": "CloudOwner",
+  "owner-defined-type": "t1",
+  "cloud-zone": "CloudZone",
+  "service_name": "vFW",
+  "customer_name": "hpa_cust",
+  "subscriber_name": "hpa_cust",
+  "vendor-name": "hpa-vendor",
+  "entitlement-pool-name": "hpa-pool",
+  "start-date": "10/08/2019",
+  "expiry-date": "12/31/2040",
+  "key-group-name": "hpa-key",
+  "key-group-type": "Universal",
+  "feature-grp-name": "hpa-feature",
+  "part-no": "hpa-part",
+  "agreement-name": "hpa-agreement",
+  "onboarding-method": "NetworkPackage",
+  "vsp-name": "hpa-vsp",
+  "vsp-desc": "hpa-vsp-desc",
+  "vsp-version": "1.0",
+  "vf-name": "hpa-vf",
+  "vf-description": "hpa-vf",
+  "vf-remarks": "remarkss",
+  "vf-version": "1.0",
+  "project-code": "000000",
+  "service-model-name": "vfw-hpa",
+  "service-model-desc": "'hpa service model'",
+  "icon-id": "network_l_1-3",
+  "category-display": "'Network L1-3'",
+  "category": "'network l1-3'",
+  "service-test-remarks": "test",
+  "service-accept-remarks": "accepted",
+  "service-approve-remarks": "approved",
+  "instance-name": "hpa-instance",
+  "requestor-id": "demo",
+  "customer-latitude": "32.897480",
+  "customer-longitude": "97.040443",
+  "company-name": "some_company",
+  "homing-solution": "oof",
+  "orchestrator": "multicloud",
+  "owning-entity-name": "OE-Demonstration",
+  "projectName": "Project-Demonstration",
+  "a-la-carte": true,
+  "test-api": "VNF_API",
+  "platform-name": "Platform-Demonstration",
+  "lob-name": "LOB-Demonstration",
+  "generic-vnf-name": "vfw-hpa-vnf",
+  "vf-module-name": "vfw-sriov-cli",
+  "supress-rollback": "false",
+  "use-preload": "true"
 }
diff --git a/test/hpa_automation/tosca/vcpe_config.json b/test/hpa_automation/tosca/vcpe_config.json
index 5f306883c..47ca8b371 100755
--- a/test/hpa_automation/tosca/vcpe_config.json
+++ b/test/hpa_automation/tosca/vcpe_config.json
@@ -1,221 +1,203 @@
 {
-    "open_cli_product" : "onap-dublin",
-    "open_cli_home" : "/opt/oclip",
-    "aai_url" : "https://10.12.5.224:30233",
-    "aai_username" : "AAI",
-    "aai_password" : "AAI",
-    "sdc_onboarding_url" : "http://10.43.89.129:8081",
-    "sdc_catalog_url" : "http://10.12.5.224:30205",
-    "sdc_password" : "demo123456!",
-    "sdc_creator" : "cs0008",
-    "sdc_tester" : "jm0007",
-    "sdc_governor" : "gv0001",
-    "sdc_operator" : "op0001",
-
-    "multicloud_url" : "http://10.12.5.224:30280",
-    "policy_url" : "https://10.12.5.224:30694",
-    "policy_username" : "testpdp",
-    "policy_password" : "alpha123",
-    "policy_directory" : "/opt/oclip/dublin/vcpe_policies",
-    "policy_scope" : "OSDF_DUBLIN",
-    "policy_onapName" : "SampleDemo",
-    "policy_config_type": "MicroService",
-    "policy_pdp_group" : "default",
-    "//" : "Put in a temp resource module name, should be the same in policy files, script will replace it in policies",
-    "temp_resource_module_name" : "resource_name",
-
-    "//" : "#Parameters required to create cloud complex",
-    "complex_name" : "clli1",
-    "street1" : "street1",
-    "street2" : "street2",
-    "physical_location" : "phy_type",
-    "data_center_code" : "code1",
-    "latitude" : "32.89948",
-    "longitude" : "97.045443",
-    "lata" : "example-lata-val-28399",
-    "elevation" : "example-elevation-val-28399",
-    "region" : "northwest",
-    "state" : "oregon",
-    "city" : "hillsboro",
-    "postal-code" : "00000",
-    "country" : "USA",
-    "identity_url" : "example-identity-url-val-56898",
-    "service-model-name" : "vfw-hpa",
-    "//" : "#Dictionary containing cloud regions and their Parameters",
-
-    "cloud_region_data":{
-        "ONAP-POD-01-Rail-05":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-aa78-4ebf-8d6f-4b62784e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        },
-        "ONAP-POD-01-Rail-06":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        },
-        "ONAP-POD-01-Rail-07":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        }
+  "open_cli_product": "onap-dublin",
+  "open_cli_home": "/opt/oclip",
+  "aai_url": "https://10.12.5.224:30233",
+  "aai_username": "AAI",
+  "aai_password": "AAI",
+  "sdc_onboarding_url": "http://10.43.89.129:8081",
+  "sdc_catalog_url": "http://10.12.5.224:30205",
+  "sdc_password": "demo123456!",
+  "sdc_creator": "cs0008",
+  "sdc_tester": "jm0007",
+  "sdc_governor": "gv0001",
+  "sdc_operator": "op0001",
+  "multicloud_url": "http://10.12.5.224:30280",
+  "policy_url": "https://10.12.5.224:30694",
+  "policy_username": "testpdp",
+  "policy_password": "alpha123",
+  "policy_directory": "/opt/oclip/dublin/vcpe_policies",
+  "policy_scope": "OSDF_DUBLIN",
+  "policy_onapName": "SampleDemo",
+  "policy_config_type": "MicroService",
+  "policy_pdp_group": "default",
+  "temp_resource_module_name": "resource_name",
+  "complex_name": "clli1",
+  "street1": "street1",
+  "street2": "street2",
+  "physical_location": "phy_type",
+  "data_center_code": "code1",
+  "latitude": "32.89948",
+  "longitude": "97.045443",
+  "lata": "example-lata-val-28399",
+  "elevation": "example-elevation-val-28399",
+  "region": "northwest",
+  "state": "oregon",
+  "city": "hillsboro",
+  "postal-code": "00000",
+  "country": "USA",
+  "identity_url": "example-identity-url-val-56898",
+  "service-model-name": "vcpe-hpa",
+  "cloud_region_data": {
+    "ONAP-POD-01-Rail-05": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-aa78-4ebf-8d6f-4b62784e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
     },
-
-    "//" : "#Parameters to register cloud region",
-    "cloud-owner" : "CloudOwner",
-    "owner-defined-type" : "t1",
-    "cloud-zone" : "CloudZone",
-
-    "service_name" : "vCPE",
-    "customer_name" : "hpa_cust",
-    "subscriber_name" : "hpa_cust",
-
-    "//" : "Onboarding parameters",
-    "vendor-name" : "Intel",
-    "entitlement-pool-name" : "hpa-pool",
-    "entitlement-description" : "hpa-pool",
-    "start-date" : "04/23/2019",
-    "expiry-date" : "12/31/2040",
-    "key-group-name" : "hpa-key",
-    "key-group-type" : "Universal",
-    "feature-grp-name" : "hpa-feature",
-    "feature-grp-desc" : "hpa-feature",
-    "part-no" : "hpa-part",
-    "agreement-name" : "hpa-agreement",
-    "agreement-desc" : "hpa-agreement",
-
-    "onboarding-method" : "NetworkPackage",
-
-    "//" : "Be sure to include single quotes in parameters that have spaces",
-    "project-code" : "000000",
-    "service-model-name" : "vcpe-hpa",
-    "service-model-desc" : "'hpa service model'",
-    "icon-id" : "network_l_1-3",
-    "category-display" : "'Network L1-3'",
-    "category" : "'network l1-3'",
-
-    "service-test-remarks" : "test",
-    "service-accept-remarks" : "accepted",
-    "service-approve-remarks" : "approved",
-
-    "//" : "#Parameters to vfc",
-    "vfc-url": "http://10.12.5.224:30280",
-    "vnfs":{
-        "infra":{
-            "path": "/opt/oclip/dublin/infra.csar",
-            "csar-id": "You need change it",
-            "vsp-name" : "infra-hpa-vsp",
-            "vsp-desc" : "infra-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "infra-hpa-vf",
-            "vf-description" : "infra-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-            "key": "key2",
-            "value": "value2"
-        },
-        "vgmux":{
-            "path": "/opt/oclip/dublin/vgmux.csar",
-            "csar-id": "You need change it",
-            "vsp-name" : "vgmux-hpa-vsp",
-            "vsp-desc" : "vgmux-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "vgmux-hpa-vf",
-            "vf-description" : "vgmux-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-            "key": "key2",
-            "value": "value2"
-        },
-        "vbng":{
-            "path": "/opt/oclip/dublin/vbng.csar",
-            "csar-id": "You need change it",
-            "vsp-name" : "vbng-hpa-vsp",
-            "vsp-desc" : "vbng-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "vbng-hpa-vf",
-            "vf-description" : "vbng-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-            "key": "key2",
-            "value": "value2"
-        },
-        "vbrgemu":{
-            "path": "/opt/oclip/dublin/vbrgemu.csar",
-            "csar-id": "You need change it",
-            "vsp-name" : "vbrgemu-hpa-vsp",
-            "vsp-desc" : "vbgremu-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "vbgremu-hpa-vf",
-            "vf-description" : "vbgremu-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-            "key": "key2",
-            "value": "value2"
-        },
-        "vgw":{
-	    "path": "/opt/oclip/dublin/vgw.csar",
-	    "csar-id": "You need change it",
-            "vsp-name" : "vgw-hpa-vsp",
-            "vsp-desc" : "vgw-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "vgw-hpa-vf",
-            "vf-description" : "vgw-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-	    "key": "key2",
-	    "value": "value2"
-	}
+    "ONAP-POD-01-Rail-06": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
     },
-    "ns":{
-        "csar-id": "You need change it",
-	"key": "key1",
-	"value": "value1",
-        "path": "/opt/oclip/dublin/ns_vgw.csar",
-        "name": "vcpe1"
+    "ONAP-POD-01-Rail-07": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    }
+  },
+  "cloud-owner": "CloudOwner",
+  "owner-defined-type": "t1",
+  "cloud-zone": "CloudZone",
+  "service_name": "vCPE",
+  "customer_name": "hpa_cust",
+  "subscriber_name": "hpa_cust",
+  "vendor-name": "Intel",
+  "entitlement-pool-name": "hpa-pool",
+  "entitlement-description": "hpa-pool",
+  "start-date": "04/23/2019",
+  "expiry-date": "12/31/2040",
+  "key-group-name": "hpa-key",
+  "key-group-type": "Universal",
+  "feature-grp-name": "hpa-feature",
+  "feature-grp-desc": "hpa-feature",
+  "part-no": "hpa-part",
+  "agreement-name": "hpa-agreement",
+  "agreement-desc": "hpa-agreement",
+  "onboarding-method": "NetworkPackage",
+  "project-code": "000000",
+  "service-model-desc": "'hpa service model'",
+  "icon-id": "network_l_1-3",
+  "category-display": "'Network L1-3'",
+  "category": "'network l1-3'",
+  "service-test-remarks": "test",
+  "service-accept-remarks": "accepted",
+  "service-approve-remarks": "approved",
+  "vfc-url": "http://10.12.5.224:30280",
+  "vnfs": {
+    "infra": {
+      "path": "/opt/oclip/dublin/infra.csar",
+      "csar-id": "You need change it",
+      "vsp-name": "infra-hpa-vsp",
+      "vsp-desc": "infra-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "infra-hpa-vf",
+      "vf-description": "infra-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
     },
-    "location": "CloudOwner_ONAP-POD-01-Rail-07",
-    "vnfm_params":{
-        "GVNFMDRIVER":{
-	    "type": "gvnfmdriver",
-	    "vendor": "vfc",
-	    "version": "v1.0",
-            "url": "http://msb-iag:80/",
-	    "vim-id": "CloudOwner_ONAP-POD-01-Rail-07",
-            "user-name": "admin",
-	    "user-password": "admin",
-	    "vnfm-version": "v1.0"
-	}
+    "vgmux": {
+      "path": "/opt/oclip/dublin/vgmux.csar",
+      "csar-id": "You need change it",
+      "vsp-name": "vgmux-hpa-vsp",
+      "vsp-desc": "vgmux-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "vgmux-hpa-vf",
+      "vf-description": "vgmux-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
     },
-    "sdc-controller-id": "2"
+    "vbng": {
+      "path": "/opt/oclip/dublin/vbng.csar",
+      "csar-id": "You need change it",
+      "vsp-name": "vbng-hpa-vsp",
+      "vsp-desc": "vbng-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "vbng-hpa-vf",
+      "vf-description": "vbng-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
+    },
+    "vbrgemu": {
+      "path": "/opt/oclip/dublin/vbrgemu.csar",
+      "csar-id": "You need change it",
+      "vsp-name": "vbrgemu-hpa-vsp",
+      "vsp-desc": "vbgremu-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "vbgremu-hpa-vf",
+      "vf-description": "vbgremu-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
+    },
+    "vgw": {
+      "path": "/opt/oclip/dublin/vgw.csar",
+      "csar-id": "You need change it",
+      "vsp-name": "vgw-hpa-vsp",
+      "vsp-desc": "vgw-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "vgw-hpa-vf",
+      "vf-description": "vgw-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
+    }
+  },
+  "ns": {
+    "csar-id": "You need change it",
+    "key": "key1",
+    "value": "value1",
+    "path": "/opt/oclip/dublin/ns_vgw.csar",
+    "name": "vcpe1"
+  },
+  "location": "CloudOwner_ONAP-POD-01-Rail-07",
+  "vnfm_params": {
+    "GVNFMDRIVER": {
+      "type": "gvnfmdriver",
+      "vendor": "vfc",
+      "version": "v1.0",
+      "url": "http://msb-iag:80/",
+      "vim-id": "CloudOwner_ONAP-POD-01-Rail-07",
+      "user-name": "admin",
+      "user-password": "admin",
+      "vnfm-version": "v1.0"
+    }
+  },
+  "sdc-controller-id": "2"
 }
diff --git a/test/hpa_automation/tosca/vcpe_vgw_config.json b/test/hpa_automation/tosca/vcpe_vgw_config.json
index d4bcef901..0291e22c3 100755
--- a/test/hpa_automation/tosca/vcpe_vgw_config.json
+++ b/test/hpa_automation/tosca/vcpe_vgw_config.json
@@ -1,171 +1,153 @@
 {
-    "open_cli_product" : "onap-dublin",
-    "open_cli_home" : "/opt/oclip",
-    "aai_url" : "https://10.12.5.224:30233",
-    "aai_username" : "AAI",
-    "aai_password" : "AAI",
-    "sdc_onboarding_url" : "http://10.43.89.129:8081",
-    "sdc_catalog_url" : "http://10.12.5.224:30205",
-    "sdc_password" : "demo123456!",
-    "sdc_creator" : "cs0008",
-    "sdc_tester" : "jm0007",
-    "sdc_governor" : "gv0001",
-    "sdc_operator" : "op0001",
-
-    "multicloud_url" : "http://10.12.5.224:30280",
-    "policy_url" : "https://10.12.5.224:30694",
-    "policy_username" : "testpdp",
-    "policy_password" : "alpha123",
-    "policy_directory" : "/opt/oclip/dublin/vcpe_policies",
-    "policy_scope" : "OSDF_DUBLIN",
-    "policy_onapName" : "SampleDemo",
-    "policy_config_type": "MicroService",
-    "policy_pdp_group" : "default",
-    "//" : "Put in a temp resource module name, should be the same in policy files, script will replace it in policies",
-    "temp_resource_module_name" : "resource_name",
-
-    "//" : "#Parameters required to create cloud complex",
-    "complex_name" : "clli1",
-    "street1" : "street1",
-    "street2" : "street2",
-    "physical_location" : "phy_type",
-    "data_center_code" : "code1",
-    "latitude" : "32.89948",
-    "longitude" : "97.045443",
-    "lata" : "example-lata-val-28399",
-    "elevation" : "example-elevation-val-28399",
-    "region" : "northwest",
-    "state" : "oregon",
-    "city" : "hillsboro",
-    "postal-code" : "00000",
-    "country" : "USA",
-    "identity_url" : "example-identity-url-val-56898",
-    "service-model-name" : "vfw-hpa",
-    "//" : "#Dictionary containing cloud regions and their Parameters",
-
-    "cloud_region_data":{
-        "ONAP-POD-01-Rail-05":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-aa78-4ebf-8d6f-4b62784e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        },
-        "ONAP-POD-01-Rail-06":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        },
-        "ONAP-POD-01-Rail-07":{
-            "cloud-region-version" : "titanium_cloud",
-            "esr-system-info-id":"4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
-            "service-url": "http://10.12.11.1:5000/v3",
-            "user-name":"${cloud-username}",
-            "password":"${cloud-password}",
-            "system-type": "VIM",
-            "ssl-insecure":true,
-            "cloud-domain":"Default",
-            "default-tenant":"Integration-HPA",
-            "tenant-id" : "709ba629fe194f8699b12f9d6ffd86a0",
-            "cloud-type" : "openstack",
-            "identity-url": "WillBeUpdatedByMultiCloud",
-            "system-status":"active"
-        }
+  "open_cli_product": "onap-dublin",
+  "open_cli_home": "/opt/oclip",
+  "aai_url": "https://10.12.5.224:30233",
+  "aai_username": "AAI",
+  "aai_password": "AAI",
+  "sdc_onboarding_url": "http://10.43.89.129:8081",
+  "sdc_catalog_url": "http://10.12.5.224:30205",
+  "sdc_password": "demo123456!",
+  "sdc_creator": "cs0008",
+  "sdc_tester": "jm0007",
+  "sdc_governor": "gv0001",
+  "sdc_operator": "op0001",
+  "multicloud_url": "http://10.12.5.224:30280",
+  "policy_url": "https://10.12.5.224:30694",
+  "policy_username": "testpdp",
+  "policy_password": "alpha123",
+  "policy_directory": "/opt/oclip/dublin/vcpe_policies",
+  "policy_scope": "OSDF_DUBLIN",
+  "policy_onapName": "SampleDemo",
+  "policy_config_type": "MicroService",
+  "policy_pdp_group": "default",
+  "temp_resource_module_name": "resource_name",
+  "complex_name": "clli1",
+  "street1": "street1",
+  "street2": "street2",
+  "physical_location": "phy_type",
+  "data_center_code": "code1",
+  "latitude": "32.89948",
+  "longitude": "97.045443",
+  "lata": "example-lata-val-28399",
+  "elevation": "example-elevation-val-28399",
+  "region": "northwest",
+  "state": "oregon",
+  "city": "hillsboro",
+  "postal-code": "00000",
+  "country": "USA",
+  "identity_url": "example-identity-url-val-56898",
+  "service-model-name": "vcpe-hpa",
+  "cloud_region_data": {
+    "ONAP-POD-01-Rail-05": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-aa78-4ebf-8d6f-4b62784e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
     },
-
-    "//" : "#Parameters to register cloud region",
-    "cloud-owner" : "CloudOwner",
-    "owner-defined-type" : "t1",
-    "cloud-zone" : "CloudZone",
-
-    "service_name" : "vCPE",
-    "customer_name" : "hpa_cust",
-    "subscriber_name" : "hpa_cust",
-
-    "//" : "Onboarding parameters",
-    "vendor-name" : "Intel",
-    "entitlement-pool-name" : "hpa-pool",
-    "entitlement-description" : "hpa-pool",
-    "start-date" : "04/23/2019",
-    "expiry-date" : "12/31/2040",
-    "key-group-name" : "hpa-key",
-    "key-group-type" : "Universal",
-    "feature-grp-name" : "hpa-feature",
-    "feature-grp-desc" : "hpa-feature",
-    "part-no" : "hpa-part",
-    "agreement-name" : "hpa-agreement",
-    "agreement-desc" : "hpa-agreement",
-
-    "onboarding-method" : "NetworkPackage",
-
-    "//" : "Be sure to include single quotes in parameters that have spaces",
-    "project-code" : "000000",
-    "service-model-name" : "vcpe-hpa",
-    "service-model-desc" : "'hpa service model'",
-    "icon-id" : "network_l_1-3",
-    "category-display" : "'Network L1-3'",
-    "category" : "'network l1-3'",
-
-    "service-test-remarks" : "test",
-    "service-accept-remarks" : "accepted",
-    "service-approve-remarks" : "approved",
-
-    "//" : "#Parameters to vfc",
-    "vfc-url": "http://10.12.5.224:30280",
-    "vnfs":{
-        "vgw":{
-	    "path": "/opt/oclip/dublin/vgw.csar",
-	    "csar-id": "You need change it",
-            "url": "http://msb-iag:80",
-            "vsp-name" : "vgw-hpa-vsp",
-            "vsp-desc" : "vgw-hpa-vsp-desc",
-            "vsp-version" : "1.0",
-            "vf-name" : "vgw-hpa-vf",
-            "vf-description" : "vgw-hpa-vf",
-            "vf-remarks" :"remarkss",
-            "vf-version" : "1.0",
-	    "key": "key2",
-	    "value": "value2"
-	}
+    "ONAP-POD-01-Rail-06": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
     },
-    "ns":{
-        "url": "http://msb-iag:80",
-        "csar-id": "You need change it",
-	"key": "key1",
-	"value": "value1",
-        "path": "/opt/oclip/dublin/ns_vgw.csar",
-        "name": "vcpe1"
-    },
-    "location": "CloudOwner_ONAP-POD-01-Rail-07",
-    "vnfm_params":{
-        "GVNFMDRIVER":{
-	    "type": "gvnfmdriver",
-	    "vendor": "vfc",
-	    "version": "v1.0",
-            "url": "http://msb-iag:80/",
-	    "vim-id": "CloudOwner_ONAP-POD-01-Rail-07",
-            "user-name": "admin",
-	    "user-password": "admin",
-	    "vnfm-version": "v1.0"
-	}
-    },
-    "sdc-controller-id": "2"
+    "ONAP-POD-01-Rail-07": {
+      "cloud-region-version": "titanium_cloud",
+      "esr-system-info-id": "4c85ce1f-aa78-4ebf-8d6f-4b62773e9bc7",
+      "service-url": "http://10.12.11.1:5000/v3",
+      "user-name": "${cloud-username}",
+      "password": "${cloud-password}",
+      "system-type": "VIM",
+      "ssl-insecure": true,
+      "cloud-domain": "Default",
+      "default-tenant": "Integration-HPA",
+      "tenant-id": "709ba629fe194f8699b12f9d6ffd86a0",
+      "cloud-type": "openstack",
+      "identity-url": "WillBeUpdatedByMultiCloud",
+      "system-status": "active"
+    }
+  },
+  "cloud-owner": "CloudOwner",
+  "owner-defined-type": "t1",
+  "cloud-zone": "CloudZone",
+  "service_name": "vCPE",
+  "customer_name": "hpa_cust",
+  "subscriber_name": "hpa_cust",
+  "vendor-name": "Intel",
+  "entitlement-pool-name": "hpa-pool",
+  "entitlement-description": "hpa-pool",
+  "start-date": "04/23/2019",
+  "expiry-date": "12/31/2040",
+  "key-group-name": "hpa-key",
+  "key-group-type": "Universal",
+  "feature-grp-name": "hpa-feature",
+  "feature-grp-desc": "hpa-feature",
+  "part-no": "hpa-part",
+  "agreement-name": "hpa-agreement",
+  "agreement-desc": "hpa-agreement",
+  "onboarding-method": "NetworkPackage",
+  "project-code": "000000",
+  "service-model-desc": "'hpa service model'",
+  "icon-id": "network_l_1-3",
+  "category-display": "'Network L1-3'",
+  "category": "'network l1-3'",
+  "service-test-remarks": "test",
+  "service-accept-remarks": "accepted",
+  "service-approve-remarks": "approved",
+  "vfc-url": "http://10.12.5.224:30280",
+  "vnfs": {
+    "vgw": {
+      "path": "/opt/oclip/dublin/vgw.csar",
+      "csar-id": "You need change it",
+      "url": "http://msb-iag:80",
+      "vsp-name": "vgw-hpa-vsp",
+      "vsp-desc": "vgw-hpa-vsp-desc",
+      "vsp-version": "1.0",
+      "vf-name": "vgw-hpa-vf",
+      "vf-description": "vgw-hpa-vf",
+      "vf-remarks": "remarkss",
+      "vf-version": "1.0",
+      "key": "key2",
+      "value": "value2"
+    }
+  },
+  "ns": {
+    "url": "http://msb-iag:80",
+    "csar-id": "You need change it",
+    "key": "key1",
+    "value": "value1",
+    "path": "/opt/oclip/dublin/ns_vgw.csar",
+    "name": "vcpe1"
+  },
+  "location": "CloudOwner_ONAP-POD-01-Rail-07",
+  "vnfm_params": {
+    "GVNFMDRIVER": {
+      "type": "gvnfmdriver",
+      "vendor": "vfc",
+      "version": "v1.0",
+      "url": "http://msb-iag:80/",
+      "vim-id": "CloudOwner_ONAP-POD-01-Rail-07",
+      "user-name": "admin",
+      "user-password": "admin",
+      "vnfm-version": "v1.0"
+    }
+  },
+  "sdc-controller-id": "2"
 }