Fix JSON files linter issues in test/mocks/pnfsimulator

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

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

diff --git a/test/mocks/pnfsimulator/deployment/src/MANIFEST.json b/test/mocks/pnfsimulator/deployment/src/MANIFEST.json
index fecdda9..1065b6e 100644 (file)
--- a/test/mocks/pnfsimulator/deployment/src/MANIFEST.json
+++ b/test/mocks/pnfsimulator/deployment/src/MANIFEST.json
@@ -1,17 +1,17 @@
 {
-    "name": "",
-    "description": "",
-    "data": [
+  "name": "",
+  "description": "",
+  "data": [
+    {
+      "file": "simulators_heat_template.yaml",
+      "type": "HEAT",
+      "isBase": "true",
+      "data": [
         {
-            "file": "simulators_heat_template.yaml",
-            "type": "HEAT",
-            "isBase": "true",
-            "data": [
-                {
-                    "file": "simulators_heat_template.env",
-                    "type": "HEAT_ENV"
-                }
-            ]
+          "file": "simulators_heat_template.env",
+          "type": "HEAT_ENV"
         }
-    ]
+      ]
+    }
+  ]
 }

diff --git a/test/mocks/pnfsimulator/pnfsimulator/config/config.json b/test/mocks/pnfsimulator/pnfsimulator/config/config.json
index 819f7d7..af45632 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/config/config.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/config/config.json
@@ -5,5 +5,5 @@
     "repeatCount": 2
   },
   "templateName": "notification.json",
-  "patch":{}
-}
\ No newline at end of file
+  "patch": {}
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/notification.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/notification.json
index 7b3e668..0b4ff2e 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/notification.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/notification.json
@@ -42,4 +42,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwrite_template.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwrite_template.json
index d6d94f7..55bf763 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwrite_template.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwrite_template.json
@@ -3,4 +3,4 @@
   "template": {
     "field1": "field1"
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwritten_template.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwritten_template.json
index f7848d4..28e7381 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwritten_template.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/overwritten_template.json
@@ -3,4 +3,4 @@
   "content": {
     "field1": "overwritten_field1"
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/registration.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/registration.json
index bf0ac71..8b7908e 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/registration.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/registration.json
@@ -33,4 +33,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/complicated_template.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/complicated_template.json
index 0edbb62..962600d 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/complicated_template.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/complicated_template.json
@@ -40,4 +40,4 @@
       "child3": "https://url.com?param1=test&param2=*"
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/simple_template.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/simple_template.json
index ad2a64a..d209a9e 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/simple_template.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/simple_template.json
@@ -9,4 +9,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_array.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_array.json
index bb3235e..0ed4326 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_array.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_array.json
@@ -20,4 +20,4 @@
     },
     "parent2": "[]"
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_booleans.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_booleans.json
index 8bf5408..4954663 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_booleans.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_booleans.json
@@ -9,4 +9,4 @@
     },
     "parent2": false
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_floats.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_floats.json
index aab3243..2b8caf4 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_floats.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_floats.json
@@ -10,4 +10,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_ints.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_ints.json
index 015cc46..369b0b4 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_ints.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/search/template_with_ints.json
@@ -9,4 +9,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/upload_template.json b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/upload_template.json
index 4c49f0e..df3ae28 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/upload_template.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/integration/src/test/resources/templates/upload_template.json
@@ -3,4 +3,4 @@
   "template": {
     "field1": "field1"
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json b/test/mocks/pnfsimulator/pnfsimulator/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json
index 6ef87c5..89e4a76 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/src/test/resources/org/onap/pnfsimulator/simulator/filesystem/test1.json
@@ -2,7 +2,11 @@
   "field1": "value1",
   "field2": 2,
   "nested": {
-    "key1": [1, 2, 3],
+    "key1": [
+      1,
+      2,
+      3
+    ],
     "key2": "sampleValue2"
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/templates/measurement.json b/test/mocks/pnfsimulator/pnfsimulator/templates/measurement.json
index 182003d..a29b063 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/templates/measurement.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/templates/measurement.json
@@ -19,7 +19,7 @@
       "measurementInterval": 180,
       "concurrentSessions": 2,
       "requestRate": "#RandomPrimitiveInteger(50,100)",
-      "meanRequestLatency":  "#RandomPrimitiveInteger(1,1000)",
+      "meanRequestLatency": "#RandomPrimitiveInteger(1,1000)",
       "cpuUsageArray": [
         {
           "cpuIdentifier": "INTEL_CORE_I7_1",
@@ -38,8 +38,7 @@
         }
       ],
       "numberOfMediaPortsInUse": 100,
-      "additionalMeasurements": [
-      ]
+      "additionalMeasurements": []
     }
   }
 }

diff --git a/test/mocks/pnfsimulator/pnfsimulator/templates/notification.json b/test/mocks/pnfsimulator/pnfsimulator/templates/notification.json
index 5657a50..74888fb 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/templates/notification.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/templates/notification.json
@@ -16,25 +16,27 @@
     "notificationFields": {
       "changeIdentifier": "PM_MEAS_FILES",
       "changeType": "FileReady",
-      "arrayOfNamedHashMap": [{
-        "name": "A20161221.1031-1041.bin.gz",
-        "hashMap": {
-          "fileformatType": "org.3GPP.32.435#measCollec",
-          "fileFormatVersion": "V10",
-          "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz",
-          "compression": "gzip"
+      "arrayOfNamedHashMap": [
+        {
+          "name": "A20161221.1031-1041.bin.gz",
+          "hashMap": {
+            "fileformatType": "org.3GPP.32.435#measCollec",
+            "fileFormatVersion": "V10",
+            "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz",
+            "compression": "gzip"
+          }
+        },
+        {
+          "name": "A20161222.1042-1102.bin.gz",
+          "hashMap": {
+            "fileFormatType": "org.3GPP.32.435#measCollec",
+            "fileFormatVersion": "V10",
+            "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz",
+            "compression": "gzip"
+          }
         }
-      }, {
-        "name": "A20161222.1042-1102.bin.gz",
-        "hashMap": {
-          "fileFormatType": "org.3GPP.32.435#measCollec",
-          "fileFormatVersion": "V10",
-          "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz",
-          "compression": "gzip"
-        }
-      }],
+      ],
       "notificationFieldsVersion": "2.0"
     }
-
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/pnfsimulator/templates/registration.json b/test/mocks/pnfsimulator/pnfsimulator/templates/registration.json
index 5a3261f..5c4dea5 100644 (file)
--- a/test/mocks/pnfsimulator/pnfsimulator/templates/registration.json
+++ b/test/mocks/pnfsimulator/pnfsimulator/templates/registration.json
@@ -19,7 +19,7 @@
       "lastEpochMicrosec": 1539239592379
     },
     "pnfRegistrationFields": {
-      "pnfRegistrationFieldsVersion":"2.0",
+      "pnfRegistrationFieldsVersion": "2.0",
       "serialNumber": "6061ZW3",
       "vendorName": "Nokia",
       "oamV4IpAddress": "val3",
@@ -30,4 +30,4 @@
       "unitType": "val8"
     }
   }
-}
\ No newline at end of file
+}

diff --git a/test/mocks/pnfsimulator/simulator-cli/tests/resources/notification.json b/test/mocks/pnfsimulator/simulator-cli/tests/resources/notification.json
index bdba8ae..ca9641e 100644 (file)
--- a/test/mocks/pnfsimulator/simulator-cli/tests/resources/notification.json
+++ b/test/mocks/pnfsimulator/simulator-cli/tests/resources/notification.json
@@ -1,15 +1,17 @@
 {
-    "commonEventHeader": {
-      "domain": "notification",
-      "eventName": "#RandomString(20)",
-      "version": "4.0.1"
-    },
-    "notificationFields": {
-      "arrayOfNamedHashMap": [{
+  "commonEventHeader": {
+    "domain": "notification",
+    "eventName": "#RandomString(20)",
+    "version": "4.0.1"
+  },
+  "notificationFields": {
+    "arrayOfNamedHashMap": [
+      {
         "name": "A20161221.1031-1041.bin.gz",
         "hashMap": {
           "fileformatType": "org.3GPP.32.435#measCollec"
         }
-      }]
-    }
-}
\ No newline at end of file
+      }
+    ]
+  }
+}