X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvpp-api%2Fpython%2Fvpp_papi%2Fvpp_serializer.py;h=a001cca565aae923164f76ae4c92d8375dd24dfa;hp=8635ce0070c64f042231067887b350764edcdd3c;hb=53fffa1;hpb=31555a3475a37195938378217a635b3451e449de diff --git a/src/vpp-api/python/vpp_papi/vpp_serializer.py b/src/vpp-api/python/vpp_papi/vpp_serializer.py index 8635ce0070c..a001cca565a 100644 --- a/src/vpp-api/python/vpp_papi/vpp_serializer.py +++ b/src/vpp-api/python/vpp_papi/vpp_serializer.py @@ -27,7 +27,7 @@ from .vpp_format import VPPFormat logger = logging.getLogger(__name__) -class BaseTypes(): +class BaseTypes(object): def __init__(self, type, elements=0): base_types = {'u8': '>B', 'u16': '>H', @@ -72,14 +72,14 @@ def vpp_get_type(name): return None -class FixedList_u8(): +class FixedList_u8(object): def __init__(self, name, field_type, num): self.name = name self.num = num self.packer = BaseTypes(field_type, num) self.size = self.packer.size - def pack(self, list, kwargs): + def pack(self, list, kwargs = None): """Packs a fixed length bytestring. Left-pads with zeros if input data is too short.""" if not list: @@ -98,7 +98,7 @@ class FixedList_u8(): return self.packer.unpack(data, offset) -class FixedList(): +class FixedList(object): def __init__(self, name, field_type, num): self.num = num self.packer = types[field_type] @@ -125,7 +125,7 @@ class FixedList(): return result, total -class VLAList(): +class VLAList(object): def __init__(self, name, field_type, len_field_name, index): self.name = name self.index = index @@ -198,7 +198,7 @@ class VLAList_legacy(): return r, total -class VPPEnumType(): +class VPPEnumType(object): def __init__(self, name, msgdef): self.size = types['u32'].size e_hash = {} @@ -227,7 +227,7 @@ class VPPEnumType(): return self.enum(x), size -class VPPUnionType(): +class VPPUnionType(object): def __init__(self, name, msgdef): self.name = name self.size = 0 @@ -277,7 +277,19 @@ class VPPUnionType(): return self.tuple._make(r), maxsize -class VPPType(): +def VPPTypeAlias(name, msgdef): + t = vpp_get_type(msgdef['type']) + if not t: + raise ValueError() + if 'length' in msgdef: + if msgdef['length'] == 0: + raise ValueError() + types[name] = FixedList(name, msgdef['type'], msgdef['length']) + else: + types[name] = t + + +class VPPType(object): # Set everything up to be able to pack / unpack def __init__(self, name, msgdef): self.name = name