Pretty print json files in tutorials/

Fixing json files to conform to linter rules.

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

20 files changed, 765 insertions, 617 deletions

diff --git a/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json
index 300ac99d..312ad651 100644
--- a/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json
+++ b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json
@@ -1,32 +1,46 @@
 {
-  "service": "queryPolicy",
-  "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD",
-  "description": "Query policy for vFW TD",
-  "templateVersion": "OpenSource.version.1",
-  "version": "OpenSource.version.1",
-  "priority": "3",
-  "riskType": "test",
-  "riskLevel": "2",
-  "guard": "False",
-  "content": {
-    "queryProperties": [
-      {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
-      {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2},
-      {"attribute":"chosen_region", "attribute_location": "chosenRegion"},
-      {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"}
-    ],
-    "policyScope": [
-      "td",
-      "us",
-      "vFW-SINK",
-      "vPGN"
-    ],
-    "policyType": "request_param_query",
-    "serviceName": "vFW_TD",
-    "identity": "vFW_TD_Query_Policy",
-    "resources": [
+    "service": "queryPolicy",
+    "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD",
+    "description": "Query policy for vFW TD",
+    "templateVersion": "OpenSource.version.1",
+    "version": "OpenSource.version.1",
+    "priority": "3",
+    "riskType": "test",
+    "riskLevel": "2",
+    "guard": "False",
+    "content": {
+        "queryProperties": [
+            {
+                "attribute": "customerLatitude",
+                "attribute_location": "customerLatitude",
+                "value": 1.1
+            },
+            {
+                "attribute": "customerLongitude",
+                "attribute_location": "customerLongitude",
+                "value": 2.2
+            },
+            {
+                "attribute": "chosen_region",
+                "attribute_location": "chosenRegion"
+            },
+            {
+                "attribute": "chosen_customer_id",
+                "attribute_location": "chosenCustomerId"
+            }
+        ],
+        "policyScope": [
+            "td",
+            "us",
             "vFW-SINK",
             "vPGN"
-    ]
-  }
+        ],
+        "policyType": "request_param_query",
+        "serviceName": "vFW_TD",
+        "identity": "vFW_TD_Query_Policy",
+        "resources": [
+            "vFW-SINK",
+            "vPGN"
+        ]
+    }
 }
diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
index 8df45e33..240c7325 100644
--- a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
+++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
@@ -16,26 +16,32 @@
             "vFW-SINK"
         ],
         "policyType": "vnfPolicy",
-        "resources": ["vFW-SINK"],
+        "resources": [
+            "vFW-SINK"
+        ],
         "applicableResources": "any",
-        "vnfProperties": [{
-            "inventoryProvider": "aai",
-            "serviceType": "",
-            "inventoryType": "vfmodule",
-            "customerId": {
-                "get_param": "chosen_customer_id"
-            },
-            "equipmentRole": "",
-            "attributes": {
-                "orchestrationStatus": ["active"],
-                "provStatus": "ACTIVE",
-                "cloudRegionId": {
-                    "get_param": "chosen_region"
+        "vnfProperties": [
+            {
+                "inventoryProvider": "aai",
+                "serviceType": "",
+                "inventoryType": "vfmodule",
+                "customerId": {
+                    "get_param": "chosen_customer_id"
                 },
-                "service_instance_id": {
-                    "get_param": "service_id"
+                "equipmentRole": "",
+                "attributes": {
+                    "orchestrationStatus": [
+                        "active"
+                    ],
+                    "provStatus": "ACTIVE",
+                    "cloudRegionId": {
+                        "get_param": "chosen_region"
+                    },
+                    "service_instance_id": {
+                        "get_param": "service_id"
+                    }
                 }
             }
-        }]
+        ]
     }
 }
diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json
index 452fdb63..277d7d0d 100644
--- a/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json
+++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json
@@ -16,26 +16,32 @@
             "vPGN"
         ],
         "policyType": "vnfPolicy",
-        "resources": ["vPGN"],
+        "resources": [
+            "vPGN"
+        ],
         "applicableResources": "any",
-        "vnfProperties": [{
-            "inventoryProvider": "aai",
-            "serviceType": "",
-            "inventoryType": "vfmodule",
-            "customerId": {
-                "get_param": "chosen_customer_id"
-            },
-            "equipmentRole": "",
-            "attributes": {
-                "orchestrationStatus": ["active"],
-                "provStatus": "ACTIVE",
-                "cloudRegionId": {
-                    "get_param": "chosen_region"
+        "vnfProperties": [
+            {
+                "inventoryProvider": "aai",
+                "serviceType": "",
+                "inventoryType": "vfmodule",
+                "customerId": {
+                    "get_param": "chosen_customer_id"
                 },
-                "service_instance_id": {
-                    "get_param": "service_id"
+                "equipmentRole": "",
+                "attributes": {
+                    "orchestrationStatus": [
+                        "active"
+                    ],
+                    "provStatus": "ACTIVE",
+                    "cloudRegionId": {
+                        "get_param": "chosen_region"
+                    },
+                    "service_instance_id": {
+                        "get_param": "service_id"
+                    }
                 }
             }
-        }]
+        ]
     }
 }
diff --git a/tutorials/vFWDT/preloads/vfw-1-preload.json b/tutorials/vFWDT/preloads/vfw-1-preload.json
index be42a3bd..59f9cf10 100644
--- a/tutorials/vFWDT/preloads/vfw-1-preload.json
+++ b/tutorials/vFWDT/preloads/vfw-1-preload.json
@@ -1,141 +1,176 @@
 {
-     "input": {
-          "request-information": {
-               "notification-url": "openecomp.org",
-               "order-number": "1",
-               "order-version": "1",
-               "request-action": "PreloadVNFRequest",
-               "request-id": "robot12"
-          },
-          "sdnc-request-header": {
-               "svc-action": "reserve",
-               "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-               "svc-request-id": "robot12"
-          },
-          "vnf-topology-information": {
-               "vnf-assignments": {
-                    "availability-zones": [],
-                    "vnf-networks": [],
-                    "vnf-vms": []
-               },
-               "vnf-parameters":
-               [{
-                         "vnf-parameter-name": "unprotected_private_net_id",
-                         "vnf-parameter-value": "unprotected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_subnet_id",
-                         "vnf-parameter-value": "unprotected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.10.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_id",
-                         "vnf-parameter-value": "protected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.20.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_subnet_id",
-                         "vnf-parameter-value": "protected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "key_name",
-                         "vnf-parameter-value": "vfw_key"
-                    }, {
-                         "vnf-parameter-name": "cloud_env",
-                         "vnf-parameter-value": "openstack"
-                    }, {
-                         "vnf-parameter-name": "vsn_name_0",
-                         "vnf-parameter-value": "vfw-vsn-1-dt"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_subnet_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_cidr",
-                         "vnf-parameter-value": "10.0.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_id",
-                         "vnf-parameter-value": "onap_oam_ext"
-                    }, {
-                         "vnf-parameter-name": "ext_private_subnet_id",
-                         "vnf-parameter-value": "onap_oam_ext_sub"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_cidr",
-                         "vnf-parameter-value": "10.100.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "nexus_artifact_repo",
-                         "vnf-parameter-value": "https://nexus.onap.org"
-                    }, {
-                         "vnf-parameter-name": "vfw_name_0",
-                         "vnf-parameter-value": "vfw-vfw-1-dt"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_port",
-                         "vnf-parameter-value": "8080"
-                    }, {
-                         "vnf-parameter-name": "public_net_id",
-                         "vnf-parameter-value": "external"
-                    }, {
-                         "vnf-parameter-name": "image_name",
-                         "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
-                    }, {
-                         "vnf-parameter-name": "flavor_name",
-                         "vnf-parameter-value": "m1.medium"
-                    }, {
-                         "vnf-parameter-name": "install_script_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.100"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_1",
-                         "vnf-parameter-value": "192.168.20.100"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_2",
-                         "vnf-parameter-value": "10.0.110.1"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_3",
-                         "vnf-parameter-value": "10.100.100.1"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.200"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.2"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.2"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.3"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_0",
-                         "vnf-parameter-value": "192.168.20.250"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.3"
-                    }, {
-                         "vnf-parameter-name": "demo_artifacts_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "pub_key",
-                         "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_ip",
-                         "vnf-parameter-value": "10.0.4.1"
-                    }, {
-                         "vnf-parameter-name": "sec_group",
-                         "vnf-parameter-value": "onap_sg_y3id"
-                    }
-               ],
-               "vnf-topology-identifier": {
-                    "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
-                    "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0",
-                    "generic-vnf-name": "vfw-vsnk-dt-1",
-                    "generic-vnf-type": "vFWSNK-DistributeTraffic 0",
-                    "vnf-name": "vfw-dt-module-1"
-               }
-          }
-     }
+    "input": {
+        "request-information": {
+            "notification-url": "openecomp.org",
+            "order-number": "1",
+            "order-version": "1",
+            "request-action": "PreloadVNFRequest",
+            "request-id": "robot12"
+        },
+        "sdnc-request-header": {
+            "svc-action": "reserve",
+            "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify",
+            "svc-request-id": "robot12"
+        },
+        "vnf-topology-information": {
+            "vnf-assignments": {
+                "availability-zones": [],
+                "vnf-networks": [],
+                "vnf-vms": []
+            },
+            "vnf-parameters": [
+                {
+                    "vnf-parameter-name": "unprotected_private_net_id",
+                    "vnf-parameter-value": "unprotected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_subnet_id",
+                    "vnf-parameter-value": "unprotected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.10.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_id",
+                    "vnf-parameter-value": "protected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.20.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_subnet_id",
+                    "vnf-parameter-value": "protected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "key_name",
+                    "vnf-parameter-value": "vfw_key"
+                },
+                {
+                    "vnf-parameter-name": "cloud_env",
+                    "vnf-parameter-value": "openstack"
+                },
+                {
+                    "vnf-parameter-name": "vsn_name_0",
+                    "vnf-parameter-value": "vfw-vsn-1-dt"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_subnet_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_cidr",
+                    "vnf-parameter-value": "10.0.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_id",
+                    "vnf-parameter-value": "onap_oam_ext"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_subnet_id",
+                    "vnf-parameter-value": "onap_oam_ext_sub"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_cidr",
+                    "vnf-parameter-value": "10.100.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "nexus_artifact_repo",
+                    "vnf-parameter-value": "https://nexus.onap.org"
+                },
+                {
+                    "vnf-parameter-name": "vfw_name_0",
+                    "vnf-parameter-value": "vfw-vfw-1-dt"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_port",
+                    "vnf-parameter-value": "8080"
+                },
+                {
+                    "vnf-parameter-name": "public_net_id",
+                    "vnf-parameter-value": "external"
+                },
+                {
+                    "vnf-parameter-name": "image_name",
+                    "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
+                },
+                {
+                    "vnf-parameter-name": "flavor_name",
+                    "vnf-parameter-value": "m1.medium"
+                },
+                {
+                    "vnf-parameter-name": "install_script_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.100"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_1",
+                    "vnf-parameter-value": "192.168.20.100"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_2",
+                    "vnf-parameter-value": "10.0.110.1"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_3",
+                    "vnf-parameter-value": "10.100.100.1"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.200"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.2"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.2"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.3"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_0",
+                    "vnf-parameter-value": "192.168.20.250"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.3"
+                },
+                {
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "pub_key",
+                    "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_ip",
+                    "vnf-parameter-value": "10.0.4.1"
+                },
+                {
+                    "vnf-parameter-name": "sec_group",
+                    "vnf-parameter-value": "onap_sg_y3id"
+                }
+            ],
+            "vnf-topology-identifier": {
+                "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
+                "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0",
+                "generic-vnf-name": "vfw-vsnk-dt-1",
+                "generic-vnf-type": "vFWSNK-DistributeTraffic 0",
+                "vnf-name": "vfw-dt-module-1"
+            }
+        }
+    }
 }
diff --git a/tutorials/vFWDT/preloads/vfw-2-preload.json b/tutorials/vFWDT/preloads/vfw-2-preload.json
index 17b473ef..6bd52687 100644
--- a/tutorials/vFWDT/preloads/vfw-2-preload.json
+++ b/tutorials/vFWDT/preloads/vfw-2-preload.json
@@ -1,141 +1,176 @@
 {
-     "input": {
-          "request-information": {
-               "notification-url": "openecomp.org",
-               "order-number": "1",
-               "order-version": "1",
-               "request-action": "PreloadVNFRequest",
-               "request-id": "robot12"
-          },
-          "sdnc-request-header": {
-               "svc-action": "reserve",
-               "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-               "svc-request-id": "robot12"
-          },
-          "vnf-topology-information": {
-               "vnf-assignments": {
-                    "availability-zones": [],
-                    "vnf-networks": [],
-                    "vnf-vms": []
-               },
-               "vnf-parameters":
-               [{
-                         "vnf-parameter-name": "unprotected_private_net_id",
-                         "vnf-parameter-value": "unprotected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_subnet_id",
-                         "vnf-parameter-value": "unprotected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.10.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_id",
-                         "vnf-parameter-value": "protected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.20.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_subnet_id",
-                         "vnf-parameter-value": "protected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "key_name",
-                         "vnf-parameter-value": "vfw_key"
-                    }, {
-                         "vnf-parameter-name": "cloud_env",
-                         "vnf-parameter-value": "openstack"
-                    }, {
-                         "vnf-parameter-name": "vsn_name_0",
-                         "vnf-parameter-value": "vfw-vsn-2-dt"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_subnet_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_cidr",
-                         "vnf-parameter-value": "10.0.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_id",
-                         "vnf-parameter-value": "onap_oam_ext"
-                    }, {
-                         "vnf-parameter-name": "ext_private_subnet_id",
-                         "vnf-parameter-value": "onap_oam_ext_sub"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_cidr",
-                         "vnf-parameter-value": "10.100.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "nexus_artifact_repo",
-                         "vnf-parameter-value": "https://nexus.onap.org"
-                    }, {
-                         "vnf-parameter-name": "vfw_name_0",
-                         "vnf-parameter-value": "vfw-vfw-2-dt"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_port",
-                         "vnf-parameter-value": "8080"
-                    }, {
-                         "vnf-parameter-name": "public_net_id",
-                         "vnf-parameter-value": "external"
-                    }, {
-                         "vnf-parameter-name": "image_name",
-                         "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
-                    }, {
-                         "vnf-parameter-name": "flavor_name",
-                         "vnf-parameter-value": "m1.medium"
-                    }, {
-                         "vnf-parameter-name": "install_script_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.110"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_1",
-                         "vnf-parameter-value": "192.168.20.110"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_2",
-                         "vnf-parameter-value": "10.0.110.4"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_3",
-                         "vnf-parameter-value": "10.100.100.4"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.200"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.2"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.2"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.5"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_0",
-                         "vnf-parameter-value": "192.168.20.240"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.5"
-                    }, {
-                         "vnf-parameter-name": "demo_artifacts_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "pub_key",
-                         "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_ip",
-                         "vnf-parameter-value": "10.0.4.1"
-                    }, {
-                         "vnf-parameter-name": "sec_group",
-                         "vnf-parameter-value": "onap_sg_y3id"
-                    }
-               ],
-               "vnf-topology-identifier": {
-                    "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
-                    "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0",
-                    "generic-vnf-name": "vfw-vsnk-dt-2",
-                    "generic-vnf-type": "vFWSNK-DistributeTraffic 1",
-                    "vnf-name": "vfw-dt-module-2"
-               }
-          }
-     }
+    "input": {
+        "request-information": {
+            "notification-url": "openecomp.org",
+            "order-number": "1",
+            "order-version": "1",
+            "request-action": "PreloadVNFRequest",
+            "request-id": "robot12"
+        },
+        "sdnc-request-header": {
+            "svc-action": "reserve",
+            "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify",
+            "svc-request-id": "robot12"
+        },
+        "vnf-topology-information": {
+            "vnf-assignments": {
+                "availability-zones": [],
+                "vnf-networks": [],
+                "vnf-vms": []
+            },
+            "vnf-parameters": [
+                {
+                    "vnf-parameter-name": "unprotected_private_net_id",
+                    "vnf-parameter-value": "unprotected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_subnet_id",
+                    "vnf-parameter-value": "unprotected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.10.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_id",
+                    "vnf-parameter-value": "protected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.20.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_subnet_id",
+                    "vnf-parameter-value": "protected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "key_name",
+                    "vnf-parameter-value": "vfw_key"
+                },
+                {
+                    "vnf-parameter-name": "cloud_env",
+                    "vnf-parameter-value": "openstack"
+                },
+                {
+                    "vnf-parameter-name": "vsn_name_0",
+                    "vnf-parameter-value": "vfw-vsn-2-dt"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_subnet_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_cidr",
+                    "vnf-parameter-value": "10.0.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_id",
+                    "vnf-parameter-value": "onap_oam_ext"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_subnet_id",
+                    "vnf-parameter-value": "onap_oam_ext_sub"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_cidr",
+                    "vnf-parameter-value": "10.100.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "nexus_artifact_repo",
+                    "vnf-parameter-value": "https://nexus.onap.org"
+                },
+                {
+                    "vnf-parameter-name": "vfw_name_0",
+                    "vnf-parameter-value": "vfw-vfw-2-dt"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_port",
+                    "vnf-parameter-value": "8080"
+                },
+                {
+                    "vnf-parameter-name": "public_net_id",
+                    "vnf-parameter-value": "external"
+                },
+                {
+                    "vnf-parameter-name": "image_name",
+                    "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
+                },
+                {
+                    "vnf-parameter-name": "flavor_name",
+                    "vnf-parameter-value": "m1.medium"
+                },
+                {
+                    "vnf-parameter-name": "install_script_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.110"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_1",
+                    "vnf-parameter-value": "192.168.20.110"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_2",
+                    "vnf-parameter-value": "10.0.110.4"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_3",
+                    "vnf-parameter-value": "10.100.100.4"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.200"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.2"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.2"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.5"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_0",
+                    "vnf-parameter-value": "192.168.20.240"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.5"
+                },
+                {
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "pub_key",
+                    "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_ip",
+                    "vnf-parameter-value": "10.0.4.1"
+                },
+                {
+                    "vnf-parameter-name": "sec_group",
+                    "vnf-parameter-value": "onap_sg_y3id"
+                }
+            ],
+            "vnf-topology-identifier": {
+                "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
+                "vnf-type": "VfwsnkDistributetraffic..base_vfw..module-0",
+                "generic-vnf-name": "vfw-vsnk-dt-2",
+                "generic-vnf-type": "vFWSNK-DistributeTraffic 1",
+                "vnf-name": "vfw-dt-module-2"
+            }
+        }
+    }
 }
diff --git a/tutorials/vFWDT/preloads/vpkg-preload.json b/tutorials/vFWDT/preloads/vpkg-preload.json
index 8a303b28..5f9bdba0 100644
--- a/tutorials/vFWDT/preloads/vpkg-preload.json
+++ b/tutorials/vFWDT/preloads/vpkg-preload.json
@@ -1,141 +1,176 @@
 {
-     "input": {
-          "request-information": {
-               "notification-url": "openecomp.org",
-               "order-number": "1",
-               "order-version": "1",
-               "request-action": "PreloadVNFRequest",
-               "request-id": "robot12"
-          },
-          "sdnc-request-header": {
-               "svc-action": "reserve",
-               "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
-               "svc-request-id": "robot12"
-          },
-          "vnf-topology-information": {
-               "vnf-assignments": {
-                    "availability-zones": [],
-                    "vnf-networks": [],
-                    "vnf-vms": []
-               },
-               "vnf-parameters":
-               [{
-                         "vnf-parameter-name": "unprotected_private_net_id",
-                         "vnf-parameter-value": "unprotected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_subnet_id",
-                         "vnf-parameter-value": "unprotected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "unprotected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.10.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_id",
-                         "vnf-parameter-value": "protected_net_dt"
-                    }, {
-                         "vnf-parameter-name": "protected_private_net_cidr",
-                         "vnf-parameter-value": "192.168.20.0/24"
-                    }, {
-                         "vnf-parameter-name": "protected_private_subnet_id",
-                         "vnf-parameter-value": "protected_subnet_dt"
-                    }, {
-                         "vnf-parameter-name": "key_name",
-                         "vnf-parameter-value": "vfw_key"
-                    }, {
-                         "vnf-parameter-name": "cloud_env",
-                         "vnf-parameter-value": "openstack"
-                    }, {
-                         "vnf-parameter-name": "vsn_name_0",
-                         "vnf-parameter-value": "vfw-vsn-0-dt"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_subnet_id",
-                         "vnf-parameter-value": "oam_onap_y3id"
-                    }, {
-                         "vnf-parameter-name": "onap_private_net_cidr",
-                         "vnf-parameter-value": "10.0.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_id",
-                         "vnf-parameter-value": "onap_oam_ext"
-                    }, {
-                         "vnf-parameter-name": "ext_private_subnet_id",
-                         "vnf-parameter-value": "onap_oam_ext_sub"
-                    }, {
-                         "vnf-parameter-name": "ext_private_net_cidr",
-                         "vnf-parameter-value": "10.100.0.0/16"
-                    }, {
-                         "vnf-parameter-name": "nexus_artifact_repo",
-                         "vnf-parameter-value": "https://nexus.onap.org"
-                    }, {
-                         "vnf-parameter-name": "vfw_name_0",
-                         "vnf-parameter-value": "vfw-vfw-0-dt"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_port",
-                         "vnf-parameter-value": "8080"
-                    }, {
-                         "vnf-parameter-name": "public_net_id",
-                         "vnf-parameter-value": "external"
-                    }, {
-                         "vnf-parameter-name": "image_name",
-                         "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
-                    }, {
-                         "vnf-parameter-name": "flavor_name",
-                         "vnf-parameter-value": "m1.medium"
-                    }, {
-                         "vnf-parameter-name": "install_script_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.100"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_1",
-                         "vnf-parameter-value": "192.168.20.100"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_2",
-                         "vnf-parameter-value": "10.0.110.1"
-                    }, {
-                         "vnf-parameter-name": "vfw_private_ip_3",
-                         "vnf-parameter-value": "10.100.100.1"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_0",
-                         "vnf-parameter-value": "192.168.10.200"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.2"
-                    }, {
-                         "vnf-parameter-name": "vpg_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.2"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_1",
-                         "vnf-parameter-value": "10.0.110.3"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_0",
-                         "vnf-parameter-value": "192.168.20.250"
-                    }, {
-                         "vnf-parameter-name": "vsn_private_ip_2",
-                         "vnf-parameter-value": "10.100.100.3"
-                    }, {
-                         "vnf-parameter-name": "demo_artifacts_version",
-                         "vnf-parameter-value": "1.4.0"
-                    }, {
-                         "vnf-parameter-name": "pub_key",
-                         "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
-                    }, {
-                         "vnf-parameter-name": "dcae_collector_ip",
-                         "vnf-parameter-value": "10.0.4.1"
-                    }, {
-                         "vnf-parameter-name": "sec_group",
-                         "vnf-parameter-value": "onap_sg_y3id"
-                    }
-               ],
-               "vnf-topology-identifier": {
-                    "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
-                    "vnf-type": "VpkgDistributetraffic..base_vpkg..module-0",
-                    "generic-vnf-name": "vpkg-dt-1",
-                    "generic-vnf-type": "vPKG-DistributeTraffic 0",
-                    "vnf-name": "vpkg-dt-module-1"
-               }
-          }
-     }
+    "input": {
+        "request-information": {
+            "notification-url": "openecomp.org",
+            "order-number": "1",
+            "order-version": "1",
+            "request-action": "PreloadVNFRequest",
+            "request-id": "robot12"
+        },
+        "sdnc-request-header": {
+            "svc-action": "reserve",
+            "svc-notification-url": "http://openecomp.org:8080/adapters/rest/SDNCNotify",
+            "svc-request-id": "robot12"
+        },
+        "vnf-topology-information": {
+            "vnf-assignments": {
+                "availability-zones": [],
+                "vnf-networks": [],
+                "vnf-vms": []
+            },
+            "vnf-parameters": [
+                {
+                    "vnf-parameter-name": "unprotected_private_net_id",
+                    "vnf-parameter-value": "unprotected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_subnet_id",
+                    "vnf-parameter-value": "unprotected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "unprotected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.10.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_id",
+                    "vnf-parameter-value": "protected_net_dt"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_net_cidr",
+                    "vnf-parameter-value": "192.168.20.0/24"
+                },
+                {
+                    "vnf-parameter-name": "protected_private_subnet_id",
+                    "vnf-parameter-value": "protected_subnet_dt"
+                },
+                {
+                    "vnf-parameter-name": "key_name",
+                    "vnf-parameter-value": "vfw_key"
+                },
+                {
+                    "vnf-parameter-name": "cloud_env",
+                    "vnf-parameter-value": "openstack"
+                },
+                {
+                    "vnf-parameter-name": "vsn_name_0",
+                    "vnf-parameter-value": "vfw-vsn-0-dt"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_subnet_id",
+                    "vnf-parameter-value": "oam_onap_y3id"
+                },
+                {
+                    "vnf-parameter-name": "onap_private_net_cidr",
+                    "vnf-parameter-value": "10.0.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_id",
+                    "vnf-parameter-value": "onap_oam_ext"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_subnet_id",
+                    "vnf-parameter-value": "onap_oam_ext_sub"
+                },
+                {
+                    "vnf-parameter-name": "ext_private_net_cidr",
+                    "vnf-parameter-value": "10.100.0.0/16"
+                },
+                {
+                    "vnf-parameter-name": "nexus_artifact_repo",
+                    "vnf-parameter-value": "https://nexus.onap.org"
+                },
+                {
+                    "vnf-parameter-name": "vfw_name_0",
+                    "vnf-parameter-value": "vfw-vfw-0-dt"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_port",
+                    "vnf-parameter-value": "8080"
+                },
+                {
+                    "vnf-parameter-name": "public_net_id",
+                    "vnf-parameter-value": "external"
+                },
+                {
+                    "vnf-parameter-name": "image_name",
+                    "vnf-parameter-value": "ubuntu-14-04-cloud-amd64"
+                },
+                {
+                    "vnf-parameter-name": "flavor_name",
+                    "vnf-parameter-value": "m1.medium"
+                },
+                {
+                    "vnf-parameter-name": "install_script_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.100"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_1",
+                    "vnf-parameter-value": "192.168.20.100"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_2",
+                    "vnf-parameter-value": "10.0.110.1"
+                },
+                {
+                    "vnf-parameter-name": "vfw_private_ip_3",
+                    "vnf-parameter-value": "10.100.100.1"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_0",
+                    "vnf-parameter-value": "192.168.10.200"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.2"
+                },
+                {
+                    "vnf-parameter-name": "vpg_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.2"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_1",
+                    "vnf-parameter-value": "10.0.110.3"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_0",
+                    "vnf-parameter-value": "192.168.20.250"
+                },
+                {
+                    "vnf-parameter-name": "vsn_private_ip_2",
+                    "vnf-parameter-value": "10.100.100.3"
+                },
+                {
+                    "vnf-parameter-name": "demo_artifacts_version",
+                    "vnf-parameter-value": "1.4.0"
+                },
+                {
+                    "vnf-parameter-name": "pub_key",
+                    "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6KbTxfT368DNBzLyfTYJ0INI7mkRXc/xMpx349TXGBTQ06g2toN/p9OM188EGZd/qERRXcdnKY8lYULVIXZEoQbXTus2gTQWXy1zn5nhSkhste3L1uG+sjHySQHBj5NyOC32iNehRNu03bHi8XRBAOHZsXx6JpkltLXgWqQI91+h9i7I/4trpPyODtzz1DLIkbXv9woncwllKf4bmm+Bk6/OJKHuAlBdCLL5diZqODEZlKOyPPC9c07a835sskMgbscPrvBQigZFRNerjQlFXXCHjRwoBMvfS7kD7/R/K1fmSLtH0w4VEp5iwS9SIezgEeO2aDFPucmYG4MQDGzAz"
+                },
+                {
+                    "vnf-parameter-name": "dcae_collector_ip",
+                    "vnf-parameter-value": "10.0.4.1"
+                },
+                {
+                    "vnf-parameter-name": "sec_group",
+                    "vnf-parameter-value": "onap_sg_y3id"
+                }
+            ],
+            "vnf-topology-identifier": {
+                "service-type": "1c38ef10-0f14-4d78-876c-3cc10ff4e535",
+                "vnf-type": "VpkgDistributetraffic..base_vpkg..module-0",
+                "generic-vnf-name": "vpkg-dt-1",
+                "generic-vnf-type": "vPKG-DistributeTraffic 0",
+                "vnf-name": "vpkg-dt-module-1"
+            }
+        }
+    }
 }
diff --git a/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json b/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json
index 5be6627b..628cfcdc 100644
--- a/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json
+++ b/tutorials/vFWDT/workflow/templates/appcDmaapLcm.json
@@ -25,4 +25,4 @@
     "correlation-id": "c09ac7d1-de62-0016-2000-e63701125557-201",
     "version": "2.0",
     "type": "request"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json b/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json
index fa0eb79e..a0151ecd 100644
--- a/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json
+++ b/tutorials/vFWDT/workflow/templates/appcRestconfLcm.json
@@ -1,21 +1,21 @@
 {
-  "input": {
-    "action": "DistributeTraffic",
-    "payload": "{\"configuration-parameters\":{\"file_parameter_content\":\"{\\\"fwIp\\\":\\\"192.168.10.100\\\",\\\"sinkIp\\\":\\\"192.168.20.250\\\"}\",\"node_list\":\"[vpkg-1]\"}}",
-    "common-header": {
-      "api-ver": "2.00",
-      "timestamp": "2019-05-20T08:18:07.244Z",
-      "flags": {
-        "force": "TRUE",
-        "mode": "NORMAL",
-        "ttl": 36000
-      },
-      "request-id": "8ac122fd-6261-4e72-ba5c-5384fcd0ab2b",
-      "originator-id": "vfw-dt-demo",
-      "sub-request-id": "cefe9354-809d-4dd2-ab6d-e1f9d2fa9ea3"
-    },
-    "action-identifiers": {
-      "vnf-id": "2d125b4d-e120-4815-a0c7-4c4bec6c89f9"
+    "input": {
+        "action": "DistributeTraffic",
+        "payload": "{\"configuration-parameters\":{\"file_parameter_content\":\"{\\\"fwIp\\\":\\\"192.168.10.100\\\",\\\"sinkIp\\\":\\\"192.168.20.250\\\"}\",\"node_list\":\"[vpkg-1]\"}}",
+        "common-header": {
+            "api-ver": "2.00",
+            "timestamp": "2019-05-20T08:18:07.244Z",
+            "flags": {
+                "force": "TRUE",
+                "mode": "NORMAL",
+                "ttl": 36000
+            },
+            "request-id": "8ac122fd-6261-4e72-ba5c-5384fcd0ab2b",
+            "originator-id": "vfw-dt-demo",
+            "sub-request-id": "cefe9354-809d-4dd2-ab6d-e1f9d2fa9ea3"
+        },
+        "action-identifiers": {
+            "vnf-id": "2d125b4d-e120-4815-a0c7-4c4bec6c89f9"
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json
index 9e7429a6..60c2b104 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/action-template.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.0.1",
     "artifact-contents": "{\r\n    \"InventoryNames\": \"VM\",\r\n    \"PlaybookName\": \"${book_name}\",\r\n    \"AutoNodeList\": True,\r\n    \"EnvParameters\": {\r\n        \"ConfigFileName\": \"../traffic_distribution_config.json\",\r\n        \"vnf_instance\": \"vfwdt\",\r\n    },\r\n    \"FileParameters\": {\r\n        \"traffic_distribution_config.json\": \"${file_parameter_content}\"\r\n    },\r\n    \"Timeout\": 3600\r\n}"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json
index 4269f0e1..765e0b1e 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/all-actions-content.json
@@ -74,4 +74,4 @@
             "scopeType": "vnf-type"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json
index c99112ae..21c51733 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/reference-all-actions.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.1",
     "artifact-contents": "{\"reference_data\":[{\"action\":\"DistributeTraffic\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"template\":\"Y\",\"vm\":[],\"device-protocol\":\"ANSIBLE\",\"user-name\":\"admin\",\"port-number\":\"8000\",\"artifact-list\":[{\"artifact-name\":\"template_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"config_template\"},{\"artifact-name\":\"pd_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.yaml\",\"artifact-type\":\"parameter_definitions\"},{\"artifact-name\":\"param_DistributeTraffic_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"param_values\"}],\"scopeType\":\"vnf-type\"},{\"action\":\"AllAction\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"artifact-list\":[{\"artifact-name\":\"reference_AllAction_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"reference_template\"}]},{\"action\":\"DistributeTrafficCheck\",\"action-level\":\"vnf\",\"scope\":{\"vnf-type\":\"vFWDT 2020-02-03 14:40:/vFWDT_vPKG 81793128-bca7 0\",\"vnfc-type-list\":[],\"vnfc-type\":\"\"},\"template\":\"Y\",\"vm\":[],\"device-protocol\":\"ANSIBLE\",\"user-name\":\"admin\",\"port-number\":\"8000\",\"artifact-list\":[{\"artifact-name\":\"template_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"config_template\"},{\"artifact-name\":\"pd_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.yaml\",\"artifact-type\":\"parameter_definitions\"},{\"artifact-name\":\"param_DistributeTrafficCheck_vFWDT2020-02-0314:40:_vFWDT_vPKG81793128-bca70_0.0.1V.json\",\"artifact-type\":\"param_values\"}],\"scopeType\":\"vnf-type\"}]}"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json
index a0104861..1f364fed 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params-list.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.0.1",
     "artifact-contents": "[{\"book_name\":\"\",\"file_parameter_content\":\"\"}]"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json
index 1824592f..737e182e 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/traffic-params.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.0.1",
     "artifact-contents": "---\nkind: \"Property Definition\"\nversion: V1\nvnf-parameter-list:\n- name: book_name\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n- name: file_parameter_content\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json
index 5d029269..b3b30163 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params-list.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.0.1",
     "artifact-contents": "[{\"book_name\":\"\",\"new-software-version\":\"\",\"existing-software-version\":\"\",\"file_parameter_content\":\"\"}]"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json
index cf656f37..968d9658 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/templates/upgrade-params.json
@@ -6,4 +6,4 @@
     "artifact-type": "APPC-CONFIG",
     "artifact-version": "0.0.1",
     "artifact-contents": "---\nkind: \"Property Definition\"\nversion: V1\nvnf-parameter-list:\n- name: book_name\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n- name: new-software-version\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n- name: existing-software-version\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n- name: file_parameter_content\n  type: null\n  description: null\n  required: null\n  default: null\n  source: Manual\n  rule-type: null\n  request-keys: null\n  response-keys: null\n"
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json
index 404cd2f5..b249032b 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/traffic.json
@@ -10,4 +10,4 @@
         "traffic_distribution_config.json": "${()=(file_parameter_content)}"
     },
     "Timeout": 3600
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json
index 49c64d0e..c875f285 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vfw-sink/upgrade.json
@@ -12,4 +12,4 @@
         "config.json": "${()=(file_parameter_content)}"
     },
     "Timeout": 3600
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json
index 404cd2f5..b249032b 100755
--- a/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json
+++ b/tutorials/vFWDT/workflow/templates/cdt-templates/vpgn/traffic.json
@@ -10,4 +10,4 @@
         "traffic_distribution_config.json": "${()=(file_parameter_content)}"
     },
     "Timeout": 3600
-}
\ No newline at end of file
+}
diff --git a/tutorials/vFWDT/workflow/templates/hasRequest.json b/tutorials/vFWDT/workflow/templates/hasRequest.json
index c9d77637..a0c678b6 100644
--- a/tutorials/vFWDT/workflow/templates/hasRequest.json
+++ b/tutorials/vFWDT/workflow/templates/hasRequest.json
@@ -3,7 +3,10 @@
     "template": {
         "constraints": {
             "affinity_vFW_TD": {
-                "demands": ["vFW-SINK", "vPGN"],
+                "demands": [
+                    "vFW-SINK",
+                    "vPGN"
+                ],
                 "properties": {
                     "category": "region",
                     "qualifier": "same"
@@ -32,57 +35,73 @@
             }
         },
         "demands": {
-            "vFW-SINK": [{
-                "attributes": {
-                    "global-customer-id": {
-                        "get_param": "chosen_customer_id"
+            "vFW-SINK": [
+                {
+                    "attributes": {
+                        "global-customer-id": {
+                            "get_param": "chosen_customer_id"
+                        },
+                        "cloud-region-id": {
+                            "get_param": "chosen_region"
+                        },
+                        "model-version-id": "202d2fd8-a045-4c9a-b767-2a1639c10291",
+                        "orchestration-status": [
+                            "active"
+                        ],
+                        "model-invariant-id": "6f3fd439-fd5f-4a2d-95bc-b6bf8787001a",
+                        "service_instance_id": {
+                            "get_param": "service_id"
+                        },
+                        "prov-status": "ACTIVE"
                     },
-                    "cloud-region-id": {
-                        "get_param": "chosen_region"
-                    },
-                    "model-version-id": "202d2fd8-a045-4c9a-b767-2a1639c10291",
-                    "orchestration-status": ["active"],
-                    "model-invariant-id": "6f3fd439-fd5f-4a2d-95bc-b6bf8787001a",
-                    "service_instance_id": {
-                        "get_param": "service_id"
-                    },
-                    "prov-status": "ACTIVE"
-                },
-                "inventory_provider": "aai",
-                "service_resource_id": "vFW-SINK-XX",
-                "inventory_type": "vfmodule",
-                "service_type": "vFW-SINK-XX",
-                "excluded_candidates": [{
+                    "inventory_provider": "aai",
+                    "service_resource_id": "vFW-SINK-XX",
                     "inventory_type": "vfmodule",
-                    "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"]
-                }],
-                "required_candidates": [{
-                    "inventory_type": "vfmodule",
-                    "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"]
-                }]
-            }],
-            "vPGN": [{
-                "attributes": {
-                    "global-customer-id": {
-                        "get_param": "chosen_customer_id"
-                    },
-                    "cloud-region-id": {
-                        "get_param": "chosen_region"
-                    },
-                    "model-version-id": "6bfe954e-bb00-4111-be3c-33eed9d20a8c",
-                    "orchestration-status": ["active"],
-                    "model-invariant-id": "3f356335-7b36-41ee-8f74-72d0a2ec3ebf",
-                    "service_instance_id": {
-                        "get_param": "service_id"
+                    "service_type": "vFW-SINK-XX",
+                    "excluded_candidates": [
+                        {
+                            "inventory_type": "vfmodule",
+                            "candidate_id": [
+                                "e765d576-8755-4145-8536-0bb6d9b1dc9a"
+                            ]
+                        }
+                    ],
+                    "required_candidates": [
+                        {
+                            "inventory_type": "vfmodule",
+                            "candidate_id": [
+                                "e765d576-8755-4145-8536-0bb6d9b1dc9a"
+                            ]
+                        }
+                    ]
+                }
+            ],
+            "vPGN": [
+                {
+                    "attributes": {
+                        "global-customer-id": {
+                            "get_param": "chosen_customer_id"
+                        },
+                        "cloud-region-id": {
+                            "get_param": "chosen_region"
+                        },
+                        "model-version-id": "6bfe954e-bb00-4111-be3c-33eed9d20a8c",
+                        "orchestration-status": [
+                            "active"
+                        ],
+                        "model-invariant-id": "3f356335-7b36-41ee-8f74-72d0a2ec3ebf",
+                        "service_instance_id": {
+                            "get_param": "service_id"
+                        },
+                        "prov-status": "ACTIVE"
                     },
-                    "prov-status": "ACTIVE"
-                },
-                "inventory_provider": "aai",
-                "service_resource_id": "vPGN-XX",
-                "unique": "false",
-                "inventory_type": "vfmodule",
-                "service_type": "vPGN-XX"
-            }]
+                    "inventory_provider": "aai",
+                    "service_resource_id": "vPGN-XX",
+                    "unique": "false",
+                    "inventory_type": "vfmodule",
+                    "service_type": "vPGN-XX"
+                }
+            ]
         },
         "homing_template_version": "2017-10-10"
     },
diff --git a/tutorials/vFWDT/workflow/templates/osdfRequest.json b/tutorials/vFWDT/workflow/templates/osdfRequest.json
index 1bef055b..1bd2ce5c 100644
--- a/tutorials/vFWDT/workflow/templates/osdfRequest.json
+++ b/tutorials/vFWDT/workflow/templates/osdfRequest.json
@@ -1,65 +1,63 @@
 {
-  "requestInfo": {
-    "transactionId": "e576c75e-7536-4145-a1c0-d60b65bb1bb8",
-    "requestId": "de4f04e3-0a65-470b-9d07-8ea6c2fb3e10",
-    "callbackUrl": "http://0.0.0.0:9000/osdfCallback/",
-    "sourceId": "SO",
-    "requestType": "create",
-    "numSolutions": 100,
-    "optimizers": [
-      "placement"
-    ],
-    "timeout": 1200
-  },
-  "placementInfo": {
-    "requestParameters": {
-      "chosenRegion": "RegionOne",
-      "chosenCustomerId": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2"
-    },
-    "subscriberInfo": {
-      "globalSubscriberId": "dbc2c763-6383-42d6-880a-b7d5c5bc84d9",
-      "subscriberName": "oof-so-chm"
+    "requestInfo": {
+        "transactionId": "e576c75e-7536-4145-a1c0-d60b65bb1bb8",
+        "requestId": "de4f04e3-0a65-470b-9d07-8ea6c2fb3e10",
+        "callbackUrl": "http://0.0.0.0:9000/osdfCallback/",
+        "sourceId": "SO",
+        "requestType": "create",
+        "numSolutions": 100,
+        "optimizers": [
+            "placement"
+        ],
+        "timeout": 1200
     },
-    "placementDemands": [
-      {
-        "resourceModuleName": "vFW-SINK",
-        "serviceResourceId": "vFW-SINK-XX",
-        "resourceModelInfo": {
-          "modelInvariantId": "fda3c1e8-7653-4acd-80ef-f5755c1d3859",
-          "modelVersionId": "a6906768-1cae-4e78-acd1-d753ac61f3e8"
+    "placementInfo": {
+        "requestParameters": {
+            "chosenRegion": "RegionOne",
+            "chosenCustomerId": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2"
         },
-        "excludedCandidates": [
-          {
-            "identifierType": "vfmodule",
-            "identifiers": [
-            ]
-          }
-        ],
-        "requiredCandidates": [
-          {
-            "identifierType": "vfmodule",
-            "identifiers": [
-            ]
-          }
+        "subscriberInfo": {
+            "globalSubscriberId": "dbc2c763-6383-42d6-880a-b7d5c5bc84d9",
+            "subscriberName": "oof-so-chm"
+        },
+        "placementDemands": [
+            {
+                "resourceModuleName": "vFW-SINK",
+                "serviceResourceId": "vFW-SINK-XX",
+                "resourceModelInfo": {
+                    "modelInvariantId": "fda3c1e8-7653-4acd-80ef-f5755c1d3859",
+                    "modelVersionId": "a6906768-1cae-4e78-acd1-d753ac61f3e8"
+                },
+                "excludedCandidates": [
+                    {
+                        "identifierType": "vfmodule",
+                        "identifiers": []
+                    }
+                ],
+                "requiredCandidates": [
+                    {
+                        "identifierType": "vfmodule",
+                        "identifiers": []
+                    }
+                ]
+            },
+            {
+                "resourceModuleName": "vPGN",
+                "serviceResourceId": "vPGN-XX",
+                "unique": "false",
+                "resourceModelInfo": {
+                    "modelInvariantId": "f2f88e29-d571-49ef-aea3-b8d13900c16f",
+                    "modelVersionId": "3ccebc76-66e1-47c8-aee9-98f30d08db97"
+                }
+            }
         ]
-      },
-      {
-        "resourceModuleName": "vPGN",
-        "serviceResourceId": "vPGN-XX",
-        "unique": "false",
-        "resourceModelInfo": {
-          "modelInvariantId": "f2f88e29-d571-49ef-aea3-b8d13900c16f",
-          "modelVersionId": "3ccebc76-66e1-47c8-aee9-98f30d08db97"
+    },
+    "serviceInfo": {
+        "serviceInstanceId": "209fb01e-60ca-4325-b074-c5ad4e0499f8",
+        "serviceName": "TD",
+        "modelInfo": {
+            "modelInvariantId": "TD-invariantId",
+            "modelVersionId": "TD-versionId"
         }
-      }
-    ]
-  },
-  "serviceInfo": {
-    "serviceInstanceId": "209fb01e-60ca-4325-b074-c5ad4e0499f8",
-    "serviceName": "TD",
-    "modelInfo": {
-      "modelInvariantId": "TD-invariantId",
-      "modelVersionId": "TD-versionId"
     }
-  }
-}
\ No newline at end of file
+}