PAPI: Union pad at the end of short fields instead of at head.

[vpp.git] / src / vpp-api / python / vpp_papi / vpp_serializer.py

diff --git a/src/vpp-api/python/vpp_papi/vpp_serializer.py b/src/vpp-api/python/vpp_papi/vpp_serializer.py
index 146a8f6..cd9a281 100644 (file)
--- a/src/vpp-api/python/vpp_papi/vpp_serializer.py
+++ b/src/vpp-api/python/vpp_papi/vpp_serializer.py
@@ -24,8 +24,6 @@ import logging
 # logger.setLevel(logging.DEBUG)
 #
 logger = logging.getLogger(__name__)
-FORMAT = "[%(filename)s:%(lineno)s - %(funcName)s() ] %(message)s"
-logging.basicConfig(format=FORMAT)
 
 
 class BaseTypes():
@@ -47,11 +45,9 @@ class BaseTypes():
                      .format(type, base_types[type]))
 
     def pack(self, data, kwargs=None):
-        logger.debug("Data: {} Format: {}".format(data, self.packer.format))
         return self.packer.pack(data)
 
     def unpack(self, data, offset, result=None):
-        logger.debug("@ {} Format: {}".format(offset, self.packer.format))
         return self.packer.unpack_from(data, offset)[0]
 
 
@@ -72,8 +68,8 @@ class FixedList_u8():
         self.size = self.packer.size
 
     def pack(self, list, kwargs):
-        logger.debug("Data: {}".format(list))
-
+        """Packs a fixed length bytestring. Left-pads with zeros
+        if input data is too short."""
         if len(list) > self.num:
             raise ValueError('Fixed list length error for "{}", got: {}'
                              ' expected: {}'
@@ -95,8 +91,6 @@ class FixedList():
         self.size = self.packer.size * num
 
     def pack(self, list, kwargs):
-        logger.debug("Data: {}".format(list))
-
         if len(list) != self.num:
             raise ValueError('Fixed list length error, got: {} expected: {}'
                              .format(len(list), self.num))
@@ -123,7 +117,6 @@ class VLAList():
         self.length_field = len_field_name
 
     def pack(self, list, kwargs=None):
-        logger.debug("Data: {}".format(list))
         if len(list) != kwargs[self.length_field]:
             raise ValueError('Variable length error, got: {} expected: {}'
                              .format(len(list), kwargs[self.length_field]))
@@ -131,16 +124,13 @@ class VLAList():
 
         # u8 array
         if self.packer.size == 1:
-            p = BaseTypes('u8', len(list))
-            return p.pack(list)
+            return bytearray(list)
 
         for e in list:
             b += self.packer.pack(e)
         return b
 
     def unpack(self, data, offset=0, result=None):
-        logger.debug("Data: {} @ {} Result: {}"
-                     .format(list, offset, result[self.index]))
         # Return a list of arguments
 
         # u8 array
@@ -165,7 +155,9 @@ class VLAList_legacy():
         self.size = self.packer.size
 
     def pack(self, list, kwargs=None):
-        logger.debug("Data: {}".format(list))
+        if self.packer.size == 1:
+            return bytes(list)
+
         b = bytes()
         for e in list:
             b += self.packer.pack(e)
@@ -177,8 +169,6 @@ class VLAList_legacy():
             raise ValueError('Legacy Variable Length Array length mismatch.')
         elements = int((len(data) - offset) / self.packer.size)
         r = []
-        logger.debug("Legacy VLA: {} elements of size {}"
-                     .format(elements, self.packer.size))
         for e in range(elements):
             x = self.packer.unpack(data, offset)
             r.append(x)
@@ -205,7 +195,6 @@ class VPPEnumType():
         return self.enum[name]
 
     def pack(self, data, kwargs=None):
-        logger.debug("Data: {}".format(data))
         return types['u32'].pack(data, kwargs)
 
     def unpack(self, data, offset=0, result=None):
@@ -240,21 +229,18 @@ class VPPUnionType():
         logger.debug('Adding union {}'.format(name))
 
     def pack(self, data, kwargs=None):
-        logger.debug("Data: {}".format(data))
         for k, v in data.items():
             logger.debug("Key: {} Value: {}".format(k, v))
             b = self.packers[k].pack(v, kwargs)
-            offset = self.size - self.packers[k].size
             break
         r = bytearray(self.size)
-        r[offset:] = b
+        r[:len(b)] = b
         return r
 
     def unpack(self, data, offset=0, result=None):
         r = []
         for k, p in self.packers.items():
-            union_offset = self.size - p.size
-            r.append(p.unpack(data, offset + union_offset))
+            r.append(p.unpack(data, offset))
         return self.tuple._make(r)
 
 
@@ -309,15 +295,16 @@ class VPPType():
     def pack(self, data, kwargs=None):
         if not kwargs:
             kwargs = data
-        logger.debug("Data: {}".format(data))
         b = bytes()
         for i, a in enumerate(self.fields):
             if a not in data:
-                logger.debug("Argument {} not given, defaulting to 0"
-                             .format(a))
                 b += b'\x00' * self.packers[i].size
                 continue
-            b += self.packers[i].pack(data[a], kwargs)
+
+            if isinstance(self.packers[i], VPPType):
+                b += self.packers[i].pack(data[a], kwargs[a])
+            else:
+                b += self.packers[i].pack(data[a], kwargs)
         return b
 
     def unpack(self, data, offset=0, result=None):
@@ -330,3 +317,7 @@ class VPPType():
             result.append(x)
             offset += p.size
         return self.tuple._make(result)
+
+
+class VPPMessage(VPPType):
+    pass