vppapigen: list imports in JSON

[vpp.git] / src / tools / vppapigen / vppapigen_json.py

diff --git a/src/tools/vppapigen/vppapigen_json.py b/src/tools/vppapigen/vppapigen_json.py
index ef1c982..35dcbca 100644 (file)
--- a/src/tools/vppapigen/vppapigen_json.py
+++ b/src/tools/vppapigen/vppapigen_json.py
@@ -1,6 +1,12 @@
 # JSON generation
 import json
 
+def walk_imports(s):
+    r = []
+    for e in s:
+        r.append(str(e))
+    return r
+
 
 def walk_enums(s):
     r = []
@@ -58,11 +64,10 @@ def walk_defs(s, is_message=False):
         r.append(d)
     return r
 
-
 #
 # Plugin entry point
 #
-def run(filename, s):
+def run(args, filename, s):
     j = {}
 
     j['types'] = (walk_defs([o for o in s['types']
@@ -74,6 +79,7 @@ def run(filename, s):
                               if o.__class__.__name__ == 'Enum']))
     j['services'] = walk_services(s['Service'])
     j['options'] = s['Option']
-    j['aliases'] = {k: v.alias for k, v in s['Alias'].items()}
+    j['aliases'] = {o.name:o.alias for o in s['types'] if o.__class__.__name__ == 'Using'}
     j['vl_api_version'] = hex(s['file_crc'])
+    j['imports'] = walk_imports(i for i in s['Import'])
     return json.dumps(j, indent=4, separators=(',', ': '))