vppapigen: simplify JSON format for services

Use

"services": {
  "foo_request": {
    "reply": "foo_request_reply"
   },
   "foo_dump": {
     "reply": "foo_details",
     "stream": true
   }
},

instead of:

"services": [
  {
    "foo_request": {
      "reply": "foo_request_reply"
     }
  },
  {
    "foo_dump": {
      "reply": "foo_details",
      "stream": true
    }
  }
],

Change-Id: I1d8e6bb4d41541b7f7f63242935f2ed4467fc52b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/src/tools/vppapigen/JSON.py b/src/tools/vppapigen/JSON.py
index d1f47eb..73bff76 100644 (file)
--- a/src/tools/vppapigen/JSON.py
+++ b/src/tools/vppapigen/JSON.py
@@ -15,14 +15,14 @@ def walk_enums(s):
 
 
 def walk_services(s):
-    r = []
+    r = {}
     for e in s:
         d = {'reply': e.reply}
         if e.stream:
             d['stream'] = True
         if e.events:
             d['events'] = e.events
-        r.append({e.caller: d})
+        r[e.caller] = d
     return r