Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: invalidate expired timer handles before dispatching
[vpp.git]
/
test
/
vpp_papi_provider.py
diff --git
a/test/vpp_papi_provider.py
b/test/vpp_papi_provider.py
index
d80f2ed
..
a440312
100644
(file)
--- a/
test/vpp_papi_provider.py
+++ b/
test/vpp_papi_provider.py
@@
-369,8
+369,7
@@
class VppPapiProvider(object):
:param cli: CLI to execute
:returns: CLI output
"""
:param cli: CLI to execute
:returns: CLI output
"""
- return cli + "\n" + self.cli(cli).encode('ascii',
- errors='backslashreplace')
+ return cli + "\n" + self.cli(cli)
def want_ip4_arp_events(self, enable_disable=1, ip="0.0.0.0"):
return self.api(self.papi.want_ip4_arp_events,
def want_ip4_arp_events(self, enable_disable=1, ip="0.0.0.0"):
return self.api(self.papi.want_ip4_arp_events,
@@
-745,9
+744,8
@@
class VppPapiProvider(object):
:param current_data_flag: (Default value = 0)
:param current_data_offset: (Default value = 0)
"""
:param current_data_flag: (Default value = 0)
:param current_data_offset: (Default value = 0)
"""
-
- mask_len = ((len(mask) - 1) / 16 + 1) * 16
- mask = mask + '\0' * (mask_len - len(mask))
+ mask_len = ((len(mask) - 1) // 16 + 1) * 16
+ mask = mask + b'\0' * (mask_len - len(mask))
return self.api(
self.papi.classify_add_del_table,
{'is_add': is_add,
return self.api(
self.papi.classify_add_del_table,
{'is_add': is_add,
@@
-784,8
+782,8
@@
class VppPapiProvider(object):
:param metadata: (Default value = 0)
"""
:param metadata: (Default value = 0)
"""
- match_len = ((len(match) - 1) / 16 + 1) * 16
- match = match + '\0' * (match_len - len(match))
+ match_len = ((len(match) - 1) /
/
16 + 1) * 16
+ match = match +
b
'\0' * (match_len - len(match))
return self.api(
self.papi.classify_add_del_session,
{'is_add': is_add,
return self.api(
self.papi.classify_add_del_session,
{'is_add': is_add,
@@
-1094,8
+1092,7
@@
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,
- '_no_type_conversion': True})
+ {'sw_if_index': sw_if_index})
def pppoe_add_del_session(
self,
def pppoe_add_del_session(
self,
@@
-1719,7
+1716,7
@@
class VppPapiProvider(object):
remote_crypto_key, integ_alg, local_integ_key,
remote_integ_key, is_add=1, esn=0, salt=0,
anti_replay=1, renumber=0,
remote_crypto_key, integ_alg, local_integ_key,
remote_integ_key, is_add=1, esn=0, salt=0,
anti_replay=1, renumber=0,
- udp_encap=0, show_instance=0):
+ udp_encap=0, show_instance=0
xffffffff
):
return self.api(
self.papi.ipsec_tunnel_if_add_del,
{
return self.api(
self.papi.ipsec_tunnel_if_add_del,
{
@@
-1804,8
+1801,7
@@
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,
- {'_no_type_conversion': True})
+ return self.api(self.papi.gbp_endpoint_dump, {})
def gbp_endpoint_group_add(self, vnid, sclass, bd,
rd, uplink_sw_if_index,
def gbp_endpoint_group_add(self, vnid, sclass, bd,
rd, uplink_sw_if_index,
@@
-1914,8
+1910,7
@@
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,
- {'_no_type_conversion': True})
+ return self.api(self.papi.gbp_subnet_dump, {})
def gbp_contract_dump(self):
""" GBP contract Dump """
def gbp_contract_dump(self):
""" GBP contract Dump """