VAPI: Ensure type definitions are generated in same order as .api file.

[vpp.git] / src / vpp-api / vapi / vapi_json_parser.py

diff --git a/src/vpp-api/vapi/vapi_json_parser.py b/src/vpp-api/vapi/vapi_json_parser.py
index 57a2238..b52b95b 100644 (file)
--- a/src/vpp-api/vapi/vapi_json_parser.py
+++ b/src/vpp-api/vapi/vapi_json_parser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 
 import json
 
@@ -22,7 +22,7 @@ def remove_magic(what):
     return what
 
 
-class Field:
+class Field(object):
 
     def __init__(
             self,
@@ -46,15 +46,18 @@ class Field:
                     (self.name, self.type, self.nelem_field))
 
 
-class Type:
+class Type(object):
     def __init__(self, name):
         self.name = name
 
+    def __str__(self):
+        return self.name
+
 
 class SimpleType (Type):
 
     def __init__(self, name):
-        super().__init__(name)
+        super(SimpleType, self).__init__(name)
 
     def __str__(self):
         return self.name
@@ -78,18 +81,22 @@ def get_msg_header_defs(struct_type_class, field_class, typedict):
     ]
 
 
-class Struct:
+class Struct(object):
 
     def __init__(self, name, fields):
         self.name = name
         self.fields = fields
         self.field_names = [n.name for n in self.fields]
 
+    def __str__(self):
+        return "[%s]" % "], [".join([str(f) for f in self.fields])
+
 
-class Message:
+class Message(object):
 
     def __init__(self, logger, definition, typedict,
                  struct_type_class, simple_type_class, field_class):
+        self.request = None
         self.logger = logger
         m = definition
         logger.debug("Parsing message definition `%s'" % m)
@@ -122,7 +129,14 @@ class Message:
                 if field_type in typedict:
                     field_type = typedict[field_type]
                 else:
-                    field_type = typedict[remove_magic(field_type)]
+                    mundane_field_type = remove_magic(field_type)
+                    if mundane_field_type in typedict:
+                        field_type = typedict[mundane_field_type]
+                    else:
+                        raise ParseError(
+                            "While parsing message `%s': could not find "
+                            "type by magic name `%s' nor by mundane name "
+                            "`%s'" % (name, field_type, mundane_field_type))
                 if len(field) == 2:
                     if self.header is not None and\
                             self.header.has_field(field[1]):
@@ -181,15 +195,27 @@ class StructType (Type, Struct):
             if len(field) == 1 and 'crc' in field:
                 self.crc = field['crc']
                 continue
-            elif len(field) == 2:
+            field_type = field[0]
+            if field_type in typedict:
+                field_type = typedict[field_type]
+            else:
+                mundane_field_type = remove_magic(field_type)
+                if mundane_field_type in typedict:
+                    field_type = typedict[mundane_field_type]
+                else:
+                    raise ParseError(
+                        "While parsing message `%s': could not find "
+                        "type by magic name `%s' nor by mundane name "
+                        "`%s'" % (name, field_type, mundane_field_type))
+            if len(field) == 2:
                 p = field_class(field_name=field[1],
-                                field_type=typedict[field[0]])
+                                field_type=field_type)
             elif len(field) == 3:
                 if field[2] == 0:
                     raise ParseError("While parsing type `%s': array `%s' has "
                                      "variable length" % (name, field[1]))
                 p = field_class(field_name=field[1],
-                                field_type=typedict[field[0]],
+                                field_type=field_type,
                                 array_len=field[2])
             else:
                 raise ParseError(
@@ -199,6 +225,10 @@ class StructType (Type, Struct):
         Type.__init__(self, name)
         Struct.__init__(self, name, fields)
 
+    def __str__(self):
+        return "StructType(%s, %s)" % (Type.__str__(self),
+                                       Struct.__str__(self))
+
     def has_field(self, name):
         return name in self.field_names
 
@@ -216,7 +246,7 @@ class StructType (Type, Struct):
         return True
 
 
-class JsonParser:
+class JsonParser(object):
     def __init__(self, logger, files, simple_type_class=SimpleType,
                  struct_type_class=StructType, field_class=Field,
                  message_class=Message):
@@ -246,7 +276,7 @@ class JsonParser:
     def parse_json_file(self, path):
         self.logger.info("Parsing json api file: `%s'" % path)
         self.json_files.append(path)
-        self.types_by_json[path] = {}
+        self.types_by_json[path] = []
         self.messages_by_json[path] = {}
         with open(path) as f:
             j = json.load(f)
@@ -260,7 +290,8 @@ class JsonParser:
                     self.exceptions.append(e)
                     continue
                 self.types[type_.name] = type_
-                self.types_by_json[path][type_.name] = type_
+                self.types_by_json[path].append(type_)
+                self.logger.debug("Parsed type: %s" % type_)
             for m in j['messages']:
                 try:
                     msg = self.message_class(self.logger, m, self.types,
@@ -292,6 +323,7 @@ class JsonParser:
                     if not m.is_reply():
                         try:
                             m.reply = self.get_reply(n)
+                            m.reply.request = m
                         except:
                             raise ParseError(
                                 "Cannot find reply to message `%s'" % n)