Fix json format issues

Issue-ID: INT-1478

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

3 files changed, 128 insertions, 109 deletions

diff --git a/robot/assets/oof/optf-has/plan_with_wrong_version.json b/robot/assets/oof/optf-has/plan_with_wrong_version.json
index 670bcb6d..ec73beeb 100644
--- a/robot/assets/oof/optf-has/plan_with_wrong_version.json
+++ b/robot/assets/oof/optf-has/plan_with_wrong_version.json
@@ -1,40 +1,36 @@
 {
-   "name":"onap template with wrong version",
-   "template":{
-      "homing_template_version":"xxxx-yy-zz",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
-         "physical_location":"DLLSTX233",
-         "REQUIRED_MEM":4,
-         "REQUIRED_DISK":100,
-         "pnf_id":"some_pnf_id"
-      },
-      "locations":{
-         "customer_loc":{
-            "latitude":{
-               "get_param":"customer_lat"
-            },
-            "longitude":{
-               "get_param":"customer_long"
-            }
-         }
-      },
-      "demands":{
-         "vG":[
-            {
-               "inventory_provider":"aai",
-               "inventory_type":"cloud"
-            }
-         ]
-      },
-      "constraints":{
-
-      },
-      "optimization":{
-
+  "name": "onap template with wrong version",
+  "template": {
+    "homing_template_version": "xxxx-yy-zz",
+    "parameters": {
+      "service_name": "Residential vCPE",
+      "service_id": "vcpe_service_id",
+      "customer_lat": 45.395968,
+      "customer_long": -71.135344,
+      "physical_location": "DLLSTX233",
+      "REQUIRED_MEM": 4,
+      "REQUIRED_DISK": 100,
+      "pnf_id": "some_pnf_id"
+    },
+    "locations": {
+      "customer_loc": {
+        "latitude": {
+          "get_param": "customer_lat"
+        },
+        "longitude": {
+          "get_param": "customer_long"
+        }
       }
-   }
+    },
+    "demands": {
+      "vG": [
+        {
+          "inventory_provider": "aai",
+          "inventory_type": "cloud"
+        }
+      ]
+    },
+    "constraints": {},
+    "optimization": {}
+  }
 }
diff --git a/robot/assets/oof/optf-osdf/pci-opt-request.json b/robot/assets/oof/optf-osdf/pci-opt-request.json
index 7ec9ab5f..abbae323 100644
--- a/robot/assets/oof/optf-osdf/pci-opt-request.json
+++ b/robot/assets/oof/optf-osdf/pci-opt-request.json
@@ -17,4 +17,4 @@
       "cell0"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/robot/assets/oof/optf-osdf/placement_request.json b/robot/assets/oof/optf-osdf/placement_request.json
index d9b16ca5..45df8190 100644
--- a/robot/assets/oof/optf-osdf/placement_request.json
+++ b/robot/assets/oof/optf-osdf/placement_request.json
@@ -6,65 +6,82 @@
     "sourceId": "SO",
     "requestType": "create",
     "numSolutions": 1,
-    "optimizers": ["placement"],
+    "optimizers": [
+      "placement"
+    ],
     "timeout": 600
   },
   "placementInfo": {
-    "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" },
-    "subscriberInfo": {"globalSubscriberId": "xxx-xx-xxx", "subscriberName": "subscriber_x"},
+    "requestParameters": {
+      "customerLatitude": 32.89748,
+      "customerLongitude": -97.040443,
+      "customerName": "xyz"
+    },
+    "subscriberInfo": {
+      "globalSubscriberId": "xxx-xx-xxx",
+      "subscriberName": "subscriber_x"
+    },
     "placementDemands": [
-        {
-            "resourceModuleName": "vGMuxInfra",
-            "serviceResourceId": "vGMuxInfra-xx",
-            "tenantId": "vGMuxInfra-tenant",
-            "resourceModelInfo": {
-                "modelInvariantId": "vGMuxInfra-modelInvariantId",
-                "modelVersionId": "vGMuxInfra-versionId",
-                "modelName": "vGMuxInfra-model",
-                "modelType": "resource",
-                "modelVersion": "1.0",
-                "modelCustomizationName": "vGMuxInfra-customeModelName"
-            }
+      {
+        "resourceModuleName": "vGMuxInfra",
+        "serviceResourceId": "vGMuxInfra-xx",
+        "tenantId": "vGMuxInfra-tenant",
+        "resourceModelInfo": {
+          "modelInvariantId": "vGMuxInfra-modelInvariantId",
+          "modelVersionId": "vGMuxInfra-versionId",
+          "modelName": "vGMuxInfra-model",
+          "modelType": "resource",
+          "modelVersion": "1.0",
+          "modelCustomizationName": "vGMuxInfra-customeModelName"
+        }
+      },
+      {
+        "resourceModuleName": "vG",
+        "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e",
+        "tenantId": "vG-tenant",
+        "resourceModelInfo": {
+          "modelInvariantId": "vG-modelInvariantId",
+          "modelVersionId": "vG-versionId",
+          "modelName": "vG-model",
+          "modelType": "resource",
+          "modelVersion": "1.0",
+          "modelCustomizationName": "vG-customeModelName"
         },
-        {
-            "resourceModuleName": "vG",
-            "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e",
-            "tenantId": "vG-tenant",
-            "resourceModelInfo": {
-                "modelInvariantId": "vG-modelInvariantId",
-                "modelVersionId": "vG-versionId",
-                "modelName": "vG-model",
-                "modelType": "resource",
-                "modelVersion": "1.0",
-                "modelCustomizationName": "vG-customeModelName"
-            },
-            "existingCandidates": [
-                {
-                    "identifierType": "serviceInstanceId",
-                    "cloudOwner": "",
-                    "identifiers": ["gjhd-098-fhd-987"]
-                }
-            ],
-            "excludedCandidates": [
-                {
-                    "identifierType": "serviceInstanceId",
-                    "cloudOwner": "",
-                    "identifiers": ["gjhd-098-fhd-987"]
-                },
-                {
-                    "identifierType": "vimId",
-                    "cloudOwner": "vmware",
-                    "identifiers": ["NYMDT67"]
-                }
-            ],
-            "requiredCandidates": [
-                {
-                    "identifierType": "vimId",
-                    "cloudOwner": "amazon",
-                    "identifiers": ["TXAUS219"]
-                }
+        "existingCandidates": [
+          {
+            "identifierType": "serviceInstanceId",
+            "cloudOwner": "",
+            "identifiers": [
+              "gjhd-098-fhd-987"
             ]
-        }
+          }
+        ],
+        "excludedCandidates": [
+          {
+            "identifierType": "serviceInstanceId",
+            "cloudOwner": "",
+            "identifiers": [
+              "gjhd-098-fhd-987"
+            ]
+          },
+          {
+            "identifierType": "vimId",
+            "cloudOwner": "vmware",
+            "identifiers": [
+              "NYMDT67"
+            ]
+          }
+        ],
+        "requiredCandidates": [
+          {
+            "identifierType": "vimId",
+            "cloudOwner": "amazon",
+            "identifiers": [
+              "TXAUS219"
+            ]
+          }
+        ]
+      }
     ]
   },
   "serviceInfo": {
@@ -80,23 +97,29 @@
     }
   },
   "licenseInfo": {
-      "licenseDemands": [
-        {
-          "resourceModuleName": "vGMuxInfra",
-          "serviceResourceId": "vGMuxInfra-xx",
-          "resourceModelInfo": {
-            "modelInvariantId": "vGMuxInfra-modelInvariantId",
-            "modelVersionId": "vGMuxInfra-versionId",
-            "modelName": "vGMuxInfra-model",
-            "modelType": "resource",
-            "modelVersion": "1.0",
-            "modelCustomizationName": "vGMuxInfra-customeModelName"
-          },
-          "existingLicenses": {
-            "entitlementPoolUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"],
-            "licenseKeyGroupUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"]
-          }
+    "licenseDemands": [
+      {
+        "resourceModuleName": "vGMuxInfra",
+        "serviceResourceId": "vGMuxInfra-xx",
+        "resourceModelInfo": {
+          "modelInvariantId": "vGMuxInfra-modelInvariantId",
+          "modelVersionId": "vGMuxInfra-versionId",
+          "modelName": "vGMuxInfra-model",
+          "modelType": "resource",
+          "modelVersion": "1.0",
+          "modelCustomizationName": "vGMuxInfra-customeModelName"
+        },
+        "existingLicenses": {
+          "entitlementPoolUUID": [
+            "87257b49-9602-4ca1-9817-094e52bc873b",
+            "43257b49-9602-4fe5-9337-094e52bc9435"
+          ],
+          "licenseKeyGroupUUID": [
+            "87257b49-9602-4ca1-9817-094e52bc873b",
+            "43257b49-9602-4fe5-9337-094e52bc9435"
+          ]
         }
-      ]
+      }
+    ]
   }
-}
\ No newline at end of file
+}