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: Add MACAddress object wrapper for vl_api_mac_address_t
[vpp.git]
/
test
/
vpp_papi_provider.py
diff --git
a/test/vpp_papi_provider.py
b/test/vpp_papi_provider.py
index
26d5fcf
..
0a33c1e
100644
(file)
--- a/
test/vpp_papi_provider.py
+++ b/
test/vpp_papi_provider.py
@@
-4,7
+4,7
@@
import time
from collections import deque
from six import moves
from collections import deque
from six import moves
-from vpp_
mac import mactobinary
+from vpp_
papi import mac_pton
from hook import Hook
from vpp_l2 import L2_PORT_TYPE
from hook import Hook
from vpp_l2 import L2_PORT_TYPE
@@
-210,10
+210,10
@@
class VppPapiProvider(object):
"""
self.hook.before_cli(cli)
cli += '\n'
"""
self.hook.before_cli(cli)
cli += '\n'
- r = self.papi.cli_inband(
length=len(cli), cmd=str(cli).encode('utf8')
)
+ r = self.papi.cli_inband(
cmd=cli
)
self.hook.after_cli(cli)
if hasattr(r, 'reply'):
self.hook.after_cli(cli)
if hasattr(r, 'reply'):
- return r.reply
.decode().rstrip('\x00')
+ return r.reply
def ppcli(self, cli):
""" Helper method to print CLI command in case of info logging level.
def ppcli(self, cli):
""" Helper method to print CLI command in case of info logging level.
@@
-223,9
+223,6
@@
class VppPapiProvider(object):
"""
return cli + "\n" + str(self.cli(cli))
"""
return cli + "\n" + str(self.cli(cli))
- def _convert_mac(self, mac):
- return mactobinary(mac)
-
def show_version(self):
""" """
return self.api(self.papi.show_version, {})
def show_version(self):
""" """
return self.api(self.papi.show_version, {})
@@
-643,7
+640,7
@@
class VppPapiProvider(object):
interface. (Default value = 0)
"""
return self.api(self.papi.l2fib_add_del,
interface. (Default value = 0)
"""
return self.api(self.papi.l2fib_add_del,
- {'mac':
self._convert_mac(mac)
,
+ {'mac':
mac
,
'bd_id': bd_id,
'sw_if_index': sw_if_index,
'is_add': is_add,
'bd_id': bd_id,
'sw_if_index': sw_if_index,
'is_add': is_add,
@@
-2821,7
+2818,8
@@
class VppPapiProvider(object):
def vxlan_gbp_tunnel_dump(self, sw_if_index=0xffffffff):
return self.api(self.papi.vxlan_gbp_tunnel_dump,
def vxlan_gbp_tunnel_dump(self, sw_if_index=0xffffffff):
return self.api(self.papi.vxlan_gbp_tunnel_dump,
- {'sw_if_index': sw_if_index})
+ {'sw_if_index': sw_if_index,
+ '_no_type_conversion': True})
def pppoe_add_del_session(
self,
def pppoe_add_del_session(
self,
@@
-3553,7
+3551,8
@@
class VppPapiProvider(object):
def gbp_endpoint_dump(self):
""" GBP endpoint Dump """
def gbp_endpoint_dump(self):
""" GBP endpoint Dump """
- return self.api(self.papi.gbp_endpoint_dump, {})
+ return self.api(self.papi.gbp_endpoint_dump,
+ {'_no_type_conversion': True})
def gbp_endpoint_group_add(self, epg, bd,
rd, uplink_sw_if_index):
def gbp_endpoint_group_add(self, epg, bd,
rd, uplink_sw_if_index):
@@
-3665,7
+3664,8
@@
class VppPapiProvider(object):
def gbp_subnet_dump(self):
""" GBP Subnet Dump """
def gbp_subnet_dump(self):
""" GBP Subnet Dump """
- return self.api(self.papi.gbp_subnet_dump, {})
+ return self.api(self.papi.gbp_subnet_dump,
+ {'_no_type_conversion': True})
def gbp_contract_add_del(self, is_add, src_epg, dst_epg, acl_index, rules):
""" GBP contract Add/Del """
def gbp_contract_add_del(self, is_add, src_epg, dst_epg, acl_index, rules):
""" GBP contract Add/Del """