ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python API: Fix mistaken removal of '_' in field names.

Browse Source 
Change-Id: I1e39970bc6ded9e6da64385b2289321ba43bebfd
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2016-04-28 12:50:20 +02:00
committed by Dave Barach
parent 194ebc58b6
commit e6749e4f6b
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vpp-api/python/pneum/api-gen.py
View File

@ -52,7 +52,11 @@ type_size = {'u8': 1,
def get_args(t): def get_args(t):
argslist = [] argslist = []
for i in t: for i in t:
argslist.append(i[1].replace('_','')) if i[1][0] == '_':
argslist.append(i[1][1:])
else:
argslist.append(i[1])
return argslist return argslist
def get_pack(t): def get_pack(t):

25
vpp-api/python/tests/test_papi.py
View File

@ -6,16 +6,27 @@ from ipaddress import *
papi_event = threading.Event() papi_event = threading.Event()
def papi_event_handler(result): def papi_event_handler(result):
if result.vlmsgid == vpp_papi.VL_API_SW_INTERFACE_SET_FLAGS: if result.vl_msg_id == vpp_papi.VL_API_SW_INTERFACE_SET_FLAGS:
papi_event.set() papi_event.set()
return return
if result.vlmsgid == vpp_papi.VL_API_VNET_INTERFACE_COUNTERS: if result.vl_msg_id == vpp_papi.VL_API_VNET_INTERFACE_COUNTERS:
format = '>' + str(int(len(result.data) / 8)) + 'Q' format = '>' + str(int(len(result.data) / 8)) + 'Q'
counters = struct.unpack(format, result.data) counters = struct.unpack(format, result.data)
print('Counters:', counters) print('Counters:', counters)
return return
if result.vl_msg_id == vpp_papi.VL_API_VNET_IP6_FIB_COUNTERS:
print('IP6 FIB Counters:', result.count, len(result.c), len(result))
i = 0
# FIB counters allocate a large (1000 bytes) block so message length does not match reality
for c in struct.iter_unpack('>16sBQQ', result.c):
# In Python 3.5 we can use a tuple for prefix, length
print(str(IPv6Address(c[0])) + '/' + str(c[1]), str(c[2]), str(c[3]))
i += 1
if i >= result.count:
break
return
print('Unknown message id:', result.vlmsgid) print('Unknown message id:', result.vl_msg_id)
class TestPAPI(unittest.TestCase): class TestPAPI(unittest.TestCase):
@ -52,7 +63,7 @@ class TestPAPI(unittest.TestCase):
t = vpp_papi.map_summary_stats() t = vpp_papi.map_summary_stats()
print(t) print(t)
self.assertEqual(t.totalbindings, 2) self.assertEqual(t.total_bindings, 2)
t = vpp_papi.map_domain_dump() t = vpp_papi.map_domain_dump()
print (t) print (t)
@ -64,8 +75,8 @@ class TestPAPI(unittest.TestCase):
# #
t = vpp_papi.sw_interface_dump(0, b'ignored') t = vpp_papi.sw_interface_dump(0, b'ignored')
for interface in t: for interface in t:
if interface.vlmsgid == vpp_papi.VL_API_SW_INTERFACE_DETAILS: if interface.vl_msg_id == vpp_papi.VL_API_SW_INTERFACE_DETAILS:
print(interface.interfacename.decode()) print(interface.interface_name.decode())
def test_want_interface_events(self): def test_want_interface_events(self):
pid = 123 pid = 123
@ -108,7 +119,7 @@ class TestPAPI(unittest.TestCase):
t = vpp_papi.tap_connect(1, b'tap', b'foo', 1, 0) t = vpp_papi.tap_connect(1, b'tap', b'foo', 1, 0)
print (t) print (t)
self.assertEqual(t.retval, 0) self.assertEqual(t.retval, 0)
swifindex = t.swifindex swifindex = t.sw_if_index
t = vpp_papi.sw_interface_set_flags(swifindex, 1, 1, 0) t = vpp_papi.sw_interface_set_flags(swifindex, 1, 1, 0)
print (t) print (t)