Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PAPI: Expose API enums to tests / applications
[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
9b30d5c
..
240912d
100644
(file)
--- a/
src/vpp-api/python/vpp_papi/vpp_serializer.py
+++ b/
src/vpp-api/python/vpp_papi/vpp_serializer.py
@@
-34,6
+34,7
@@
class BaseTypes():
'i32': '>i',
'u64': '>Q',
'f64': '>d',
'i32': '>i',
'u64': '>Q',
'f64': '>d',
+ 'bool': '>?',
'header': '>HI'}
if elements > 0 and type == 'u8':
'header': '>HI'}
if elements > 0 and type == 'u8':
@@
-48,7
+49,7
@@
class BaseTypes():
return self.packer.pack(data)
def unpack(self, data, offset, result=None):
return self.packer.pack(data)
def unpack(self, data, offset, result=None):
- return self.packer.unpack_from(data, offset)[0]
+ return self.packer.unpack_from(data, offset)[0]
, self.packer.size
types = {}
types = {}
@@
-58,6
+59,14
@@
types['u32'] = BaseTypes('u32')
types['i32'] = BaseTypes('i32')
types['u64'] = BaseTypes('u64')
types['f64'] = BaseTypes('f64')
types['i32'] = BaseTypes('i32')
types['u64'] = BaseTypes('u64')
types['f64'] = BaseTypes('f64')
+types['bool'] = BaseTypes('bool')
+
+
+def vpp_get_type(name):
+ try:
+ return types[name]
+ except KeyError:
+ return None
class FixedList_u8():
class FixedList_u8():
@@
-80,7
+89,7
@@
class FixedList_u8():
if len(data[offset:]) < self.num:
raise ValueError('Invalid array length for "{}" got {}'
' expected {}'
if len(data[offset:]) < self.num:
raise ValueError('Invalid array length for "{}" got {}'
' expected {}'
- .format(self.name, len(data), self.num))
+ .format(self.name, len(data
[offset:]
), self.num))
return self.packer.unpack(data, offset)
return self.packer.unpack(data, offset)
@@
-102,15
+111,18
@@
class FixedList():
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
result = []
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
result = []
+ total = 0
for e in range(self.num):
for e in range(self.num):
- x = self.packer.unpack(data, offset)
+ x
, size
= self.packer.unpack(data, offset)
result.append(x)
result.append(x)
- offset += self.packer.size
- return result
+ offset += size
+ total += size
+ return result, total
class VLAList():
def __init__(self, name, field_type, len_field_name, index):
class VLAList():
def __init__(self, name, field_type, len_field_name, index):
+ self.name = name
self.index = index
self.packer = types[field_type]
self.size = self.packer.size
self.index = index
self.packer = types[field_type]
self.size = self.packer.size
@@
-132,21
+144,22
@@
class VLAList():
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
+ total = 0
# u8 array
if self.packer.size == 1:
if result[self.index] == 0:
# u8 array
if self.packer.size == 1:
if result[self.index] == 0:
- return b''
+ return b''
, 0
p = BaseTypes('u8', result[self.index])
p = BaseTypes('u8', result[self.index])
- r = p.unpack(data, offset)
- return r
+ return p.unpack(data, offset)
r = []
for e in range(result[self.index]):
r = []
for e in range(result[self.index]):
- x = self.packer.unpack(data, offset)
+ x
, size
= self.packer.unpack(data, offset)
r.append(x)
r.append(x)
- offset += self.packer.size
- return r
+ offset += size
+ total += size
+ return r, total
class VLAList_legacy():
class VLAList_legacy():
@@
-164,16
+177,18
@@
class VLAList_legacy():
return b
def unpack(self, data, offset=0, result=None):
return b
def unpack(self, data, offset=0, result=None):
+ total = 0
# Return a list of arguments
if (len(data) - offset) % self.packer.size:
raise ValueError('Legacy Variable Length Array length mismatch.')
elements = int((len(data) - offset) / self.packer.size)
r = []
for e in range(elements):
# Return a list of arguments
if (len(data) - offset) % self.packer.size:
raise ValueError('Legacy Variable Length Array length mismatch.')
elements = int((len(data) - offset) / self.packer.size)
r = []
for e in range(elements):
- x = self.packer.unpack(data, offset)
+ x
, size
= self.packer.unpack(data, offset)
r.append(x)
offset += self.packer.size
r.append(x)
offset += self.packer.size
- return r
+ total += size
+ return r, total
class VPPEnumType():
class VPPEnumType():
@@
-194,12
+209,15
@@
class VPPEnumType():
def __getattr__(self, name):
return self.enum[name]
def __getattr__(self, name):
return self.enum[name]
+ def __nonzero__(self):
+ return True
+
def pack(self, data, kwargs=None):
return types['u32'].pack(data, kwargs)
def unpack(self, data, offset=0, result=None):
def pack(self, data, kwargs=None):
return types['u32'].pack(data, kwargs)
def unpack(self, data, offset=0, result=None):
- x = types['u32'].unpack(data, offset)
- return self.enum(x)
+ x
, size
= types['u32'].unpack(data, offset)
+ return self.enum(x)
, size
class VPPUnionType():
class VPPUnionType():
@@
-232,18
+250,20
@@
class VPPUnionType():
for k, v in data.items():
logger.debug("Key: {} Value: {}".format(k, v))
b = self.packers[k].pack(v, kwargs)
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)
break
r = bytearray(self.size)
- r[
offset:
] = b
+ r[
:len(b)
] = b
return r
def unpack(self, data, offset=0, result=None):
r = []
return r
def unpack(self, data, offset=0, result=None):
r = []
+ maxsize = 0
for k, p in self.packers.items():
for k, p in self.packers.items():
- union_offset = self.size - p.size
- r.append(p.unpack(data, offset + union_offset))
- return self.tuple._make(r)
+ x, size = p.unpack(data, offset)
+ if size > maxsize:
+ maxsize = size
+ r.append(x)
+ return self.tuple._make(r), maxsize
class VPPType():
class VPPType():
@@
-312,13
+332,16
@@
class VPPType():
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
result = []
def unpack(self, data, offset=0, result=None):
# Return a list of arguments
result = []
+ total = 0
for p in self.packers:
for p in self.packers:
- x = p.unpack(data, offset, result)
+ x
, size
= p.unpack(data, offset, result)
if type(x) is tuple and len(x) == 1:
x = x[0]
result.append(x)
if type(x) is tuple and len(x) == 1:
x = x[0]
result.append(x)
- offset += p.size
- return self.tuple._make(result)
+ offset += size
+ total += size
+ t = self.tuple._make(result)
+ return t, total
class VPPMessage(VPPType):
class VPPMessage(VPPType):