From 02f5e63784f54872e972fc5dfc680f38bf0f0fd6 Mon Sep 17 00:00:00 2001
From: Sebastien Binet <binet@cern.ch>
Date: Thu, 10 Nov 2016 14:22:11 +0100
Subject: [PATCH] all: use strict(er) and more regular JSON schema

---
 .../ProgOptionTest/macro/testJSON.json        | 59 +++++++++----------
 fairmq/run/benchmark.json                     | 36 +++++------
 2 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/fairmq/options/ProgOptionTest/macro/testJSON.json b/fairmq/options/ProgOptionTest/macro/testJSON.json
index 060eb389..33691a63 100644
--- a/fairmq/options/ProgOptionTest/macro/testJSON.json
+++ b/fairmq/options/ProgOptionTest/macro/testJSON.json
@@ -1,60 +1,57 @@
 {
   "fairMQOptions": {
-    "device": 
-      {
+    "devices":
+	[{
         "id": "merger1",
-        "channel": 
-          {
+        "channels":
+		[{
             "name": "two_inputs_channel",
-            "socket": 
-              {
+            "sockets":
+			[{
                 "type": "pull",
                 "address": "tcp://*:5569",
-                "sndBufSize": "1000",
-                "rcvBufSize": "1000",
-                "rateLogging": "1"
+                "sndBufSize": 1000,
+                "rcvBufSize": 1000,
+                "rateLogging": 1
               },
-              "socket": 
               {
                 "type": "pull",
                 "method": "bind",
                 "address": "tcp://*:5570",
-                "sndBufSize": "1000",
-                "rcvBufSize": "1000",
-                "rateLogging": "1"
-              }
+                "sndBufSize": 1000,
+                "rcvBufSize": 1000,
+                "rateLogging": 1
+              }]
             
           },
-          "channel":
           {
             "name": "one_output_channel",
-            "socket": {
+            "sockets": [{
               "type": "push",
               "method": "connect",
               "address": "tcp://*:5571",
-              "sndBufSize": "1000",
-              "rcvBufSize": "1000",
-              "rateLogging": "1"
-            }
-          }
+              "sndBufSize": 1000,
+              "rcvBufSize": 1000,
+              "rateLogging": 1
+            }]
+          }]
         
       },
-      "device":
       {
         "id": "sink1",
-        "channel": {
+        "channels": [{
           "name": "one_input",
-          "socket": {
+          "sockets": [{
             "name": "input1",
             "type": "pull",
             "method": "bind",
             "address": "tcp://localhost:5571",
-            "sndBufSize": "1000",
-            "rcvBufSize": "1000",
-            "rateLogging": "1"
-          }
-        }
-      }
+            "sndBufSize": 1000,
+            "rcvBufSize": 1000,
+            "rateLogging": 1
+          }]
+        }]
+      }]
     
   }
-}
\ No newline at end of file
+}
diff --git a/fairmq/run/benchmark.json b/fairmq/run/benchmark.json
index 26cf9354..0612b81a 100644
--- a/fairmq/run/benchmark.json
+++ b/fairmq/run/benchmark.json
@@ -4,35 +4,35 @@
         "devices":
         [{
             "id": "bsampler1",
-            "channel":
-            {
+            "channels":
+			[{
                 "name": "data",
-                "socket":
-                {
+                "sockets":
+				[{
                     "type": "push",
                     "method": "bind",
                     "address": "tcp://127.0.0.1:5555",
-                    "sndBufSize": "1000",
-                    "rcvBufSize": "1000",
-                    "rateLogging": "1"
-                }
-            }
+                    "sndBufSize": 1000,
+                    "rcvBufSize": 1000,
+                    "rateLogging": 1
+                }]
+            }]
         },
         {
             "id": "sink1",
-            "channel":
-            {
+            "channels":
+			[{
                 "name": "data",
-                "socket":
-                {
+                "sockets":
+				[{
                     "type": "pull",
                     "method": "connect",
                     "address": "tcp://127.0.0.1:5555",
-                    "sndBufSize": "1000",
-                    "rcvBufSize": "1000",
-                    "rateLogging": "1"
-                }
-            }
+                    "sndBufSize": 1000,
+                    "rcvBufSize": 1000,
+                    "rateLogging": 1
+                }]
+            }]
         }]
     }
 }