summaryrefslogtreecommitdiffstats
path: root/test/vpp_papi_provider.py
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-03-04 23:55:43 +0100
committerOle Troan <ot@cisco.com>2019-03-04 23:55:43 +0100
commite1ade684eb5a7e5743abfda47488165452cc5b64 (patch)
tree63b4e3ccc361904b42e0020bfc16b4d110cd0095 /test/vpp_papi_provider.py
parentfd06084a9e86c5f67c4b1dc37e78a95a9bacf2a4 (diff)
test framework: Fix wrapper functions to match API message names.
In preparation to remove the wrappers in vpp_papi_provider.py, ensure names used in tests match the actual API message names. Change-Id: I230ca4eb75aa727ff68d702e085a2edbbc6b6d19 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/vpp_papi_provider.py')
-rw-r--r--test/vpp_papi_provider.py220
1 files changed, 74 insertions, 146 deletions
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 7b5709ed8ac..9635aa5859b 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -336,8 +336,8 @@ class VppPapiProvider(object):
return self.api(self.papi.ip_unnumbered_dump,
{'sw_if_index': sw_if_index})
- def sw_interface_enable_disable_mpls(self, sw_if_index,
- is_enable=1):
+ def sw_interface_set_mpls_enable(self, sw_if_index,
+ is_enable=1):
"""
Enable/Disable MPLS on the interface
:param sw_if_index:
@@ -348,11 +348,6 @@ class VppPapiProvider(object):
{'sw_if_index': sw_if_index,
'enable': is_enable})
- def sw_interface_ra_suppress(self, sw_if_index, suppress=1):
- return self.api(self.papi.sw_interface_ip6nd_ra_config,
- {'sw_if_index': sw_if_index,
- 'suppress': suppress})
-
def set_ip_flow_hash(self,
table_id,
src=1,
@@ -372,34 +367,24 @@ class VppPapiProvider(object):
'reverse': reverse,
'is_ipv6': is_ip6})
- def ip6_nd_proxy(self, ip, sw_if_index, is_del=0):
+ def ip6nd_proxy_add_del(self, ip, sw_if_index, is_del=0):
return self.api(self.papi.ip6nd_proxy_add_del,
{'ip': ip,
'sw_if_index': sw_if_index,
'is_del': is_del})
- def ip6_sw_interface_ra_config(self, sw_if_index,
- no,
- suppress,
- send_unicast):
- return self.api(self.papi.sw_interface_ip6nd_ra_config,
- {'sw_if_index': sw_if_index,
- 'is_no': no,
- 'suppress': suppress,
- 'send_unicast': send_unicast})
-
- def ip6_sw_interface_ra_prefix(self,
- sw_if_index,
- address,
- address_length,
- use_default=0,
- no_advertise=0,
- off_link=0,
- no_autoconfig=0,
- no_onlink=0,
- is_no=0,
- val_lifetime=0xffffffff,
- pref_lifetime=0xffffffff):
+ def sw_interface_ip6nd_ra_prefix(self,
+ sw_if_index,
+ address,
+ address_length,
+ use_default=0,
+ no_advertise=0,
+ off_link=0,
+ no_autoconfig=0,
+ no_onlink=0,
+ is_no=0,
+ val_lifetime=0xffffffff,
+ pref_lifetime=0xffffffff):
return self.api(self.papi.sw_interface_ip6nd_ra_prefix,
{'sw_if_index': sw_if_index,
'prefix': {
@@ -415,7 +400,7 @@ class VppPapiProvider(object):
'val_lifetime': val_lifetime,
'pref_lifetime': pref_lifetime})
- def ip6_sw_interface_enable_disable(self, sw_if_index, enable):
+ def sw_interface_ip6_enable_disable(self, sw_if_index, enable):
"""
Enable/Disable An interface for IPv6
"""
@@ -565,8 +550,8 @@ class VppPapiProvider(object):
{'enable_disable': enable_disable,
'pid': os.getpid(), })
- def want_macs_learn_events(self, enable_disable=1, scan_delay=0,
- max_macs_in_event=0, learn_limit=0):
+ def want_l2_macs_events(self, enable_disable=1, scan_delay=0,
+ max_macs_in_event=0, learn_limit=0):
return self.api(self.papi.want_l2_macs_events,
{'enable_disable': enable_disable,
'scan_delay': scan_delay,
@@ -761,7 +746,7 @@ class VppPapiProvider(object):
'tx_sw_if_index': tx_sw_if_index,
'enable': enable})
- def sw_interface_set_l2_tag_rewrite(
+ def l2_interface_vlan_tag_rewrite(
self,
sw_if_index,
vtr_oper,
@@ -785,7 +770,7 @@ class VppPapiProvider(object):
'tag1': tag1,
'tag2': tag2})
- def sw_interface_set_l2_emulation(
+ def l2_emulation(
self,
sw_if_index,
enable=1):
@@ -830,16 +815,6 @@ class VppPapiProvider(object):
{'sw_if_index': sw_if_index,
'mtu': mtu})
- def sw_interface_set_promiscuous(self, sw_if_index, enable):
- """
- :param sw_if_index:
- :param enable:
-
- """
- return self.api(self.papi.sw_interface_set_promiscuous,
- {'sw_if_index': sw_if_index,
- 'enable': enable})
-
def sw_interface_set_mac_address(self, sw_if_index, mac):
return self.api(self.papi.sw_interface_set_mac_address,
{'sw_if_index': sw_if_index,
@@ -880,7 +855,7 @@ class VppPapiProvider(object):
'outer_vlan_id': outer_vlan,
'inner_vlan_id': inner_vlan})
- def create_p2pethernet_subif(self, sw_if_index, remote_mac, subif_id):
+ def p2p_ethernet_add(self, sw_if_index, remote_mac, subif_id):
"""Create p2p ethernet subinterface
:param sw_if_index: main (parent) interface
@@ -901,7 +876,7 @@ class VppPapiProvider(object):
return self.api(self.papi.delete_subif,
{'sw_if_index': sw_if_index})
- def delete_p2pethernet_subif(self, sw_if_index, remote_mac):
+ def p2p_ethernet_del(self, sw_if_index, remote_mac):
"""Delete p2p ethernet subinterface
:param sw_if_index: main (parent) interface
@@ -1120,23 +1095,6 @@ class VppPapiProvider(object):
}
)
- def reset_vrf(self,
- vrf_id,
- is_ipv6=0,
- ):
- """ Reset VRF (remove all routes etc.) request.
-
- :param int vrf_id: ID of the FIB table / VRF to reset.
- :param int is_ipv6: 1 for IPv6 neighbor, 0 for IPv4. (Default = 0)
- """
-
- return self.api(
- self.papi.reset_vrf,
- {'vrf_id': vrf_id,
- 'is_ipv6': is_ipv6,
- }
- )
-
def reset_fib(self,
vrf_id,
is_ipv6=0,
@@ -1184,7 +1142,7 @@ class VppPapiProvider(object):
'is_l2': is_l2,
})
- def gre_tunnel_add_del(self,
+ def gre_add_del_tunnel(self,
src_address,
dst_address,
outer_fib_id=0,
@@ -1249,11 +1207,6 @@ class VppPapiProvider(object):
def udp_encap_dump(self):
return self.api(self.papi.udp_encap_dump, {})
- def want_udp_encap_stats(self, enable=1):
- return self.api(self.papi.want_udp_encap_stats,
- {'enable': enable,
- 'pid': os.getpid()})
-
def mpls_fib_dump(self):
return self.api(self.papi.mpls_fib_dump, {})
@@ -1591,7 +1544,7 @@ class VppPapiProvider(object):
"""
return self.api(self.papi.nat_show_config, {})
- def nat44_add_interface_addr(
+ def nat44_add_del_interface_addr(
self,
sw_if_index,
twice_nat=0,
@@ -1614,7 +1567,7 @@ class VppPapiProvider(object):
"""
return self.api(self.papi.nat44_interface_addr_dump, {})
- def nat_ipfix(
+ def nat_ipfix_enable_disable(
self,
domain_id=1,
src_port=4739,
@@ -2082,31 +2035,6 @@ class VppPapiProvider(object):
"""
return self.api(self.papi.nat64_bib_dump, {'proto': protocol})
- def nat64_set_timeouts(self, udp=300, icmp=60, tcp_trans=240, tcp_est=7440,
- tcp_incoming_syn=6):
- """Set values of timeouts for NAT64 (in seconds)
-
- :param udpi: UDP timeout (Default value = 300)
- :param icmp: ICMP timeout (Default value = 60)
- :param tcp_trans: TCP transitory timeout (Default value = 240)
- :param tcp_est: TCP established timeout (Default value = 7440)
- :param tcp_incoming_syn: TCP incoming SYN timeout (Default value = 6)
- """
- return self.api(
- self.papi.nat64_set_timeouts,
- {'udp': udp,
- 'icmp': icmp,
- 'tcp_trans': tcp_trans,
- 'tcp_est': tcp_est,
- 'tcp_incoming_syn': tcp_incoming_syn})
-
- def nat64_get_timeouts(self):
- """Get values of timeouts for NAT64
-
- :return: Timeouts for NAT64 (in seconds)
- """
- return self.api(self.papi.nat64_get_timeouts, {})
-
def nat64_st_dump(self, protocol=255):
"""Dump NAT64 session table
@@ -2137,7 +2065,7 @@ class VppPapiProvider(object):
"""
return self.api(self.papi.nat64_prefix_dump, {})
- def nat64_add_interface_addr(
+ def nat64_add_del_interface_addr(
self,
sw_if_index,
is_add=1):
@@ -2591,13 +2519,13 @@ class VppPapiProvider(object):
def dhcp_client_dump(self):
return self.api(self.papi.dhcp_client_dump, {})
- def dhcp_client(self,
- sw_if_index,
- hostname,
- client_id='',
- is_add=1,
- set_broadcast_flag=1,
- want_dhcp_events=0):
+ def dhcp_client_config(self,
+ sw_if_index,
+ hostname,
+ client_id='',
+ is_add=1,
+ set_broadcast_flag=1,
+ want_dhcp_events=0):
return self.api(
self.papi.dhcp_client_config,
{
@@ -2662,9 +2590,9 @@ class VppPapiProvider(object):
'is_en': is_enabled,
})
- def lisp_locator_set(self,
- ls_name,
- is_add=1):
+ def lisp_add_del_locator_set(self,
+ ls_name,
+ is_add=1):
return self.api(
self.papi.lisp_add_del_locator_set,
{
@@ -2675,12 +2603,12 @@ class VppPapiProvider(object):
def lisp_locator_set_dump(self):
return self.api(self.papi.lisp_locator_set_dump, {})
- def lisp_locator(self,
- ls_name,
- sw_if_index,
- priority=1,
- weight=1,
- is_add=1):
+ def lisp_add_del_locator(self,
+ ls_name,
+ sw_if_index,
+ priority=1,
+ weight=1,
+ is_add=1):
return self.api(
self.papi.lisp_add_del_locator,
{
@@ -2700,15 +2628,15 @@ class VppPapiProvider(object):
'ls_index': ls_index,
})
- def lisp_local_mapping(self,
- ls_name,
- eid_type,
- eid,
- prefix_len,
- vni=0,
- key_id=0,
- key="",
- is_add=1):
+ def lisp_add_del_local_eid(self,
+ ls_name,
+ eid_type,
+ eid,
+ prefix_len,
+ vni=0,
+ key_id=0,
+ key="",
+ is_add=1):
return self.api(
self.papi.lisp_add_del_local_eid,
{
@@ -2740,15 +2668,15 @@ class VppPapiProvider(object):
'filter': filter_opt,
})
- def lisp_remote_mapping(self,
- eid_type,
- eid,
- eid_prefix_len=0,
- vni=0,
- rlocs=[],
- rlocs_num=0,
- is_src_dst=0,
- is_add=1):
+ def lisp_add_del_remote_mapping(self,
+ eid_type,
+ eid,
+ eid_prefix_len=0,
+ vni=0,
+ rlocs=[],
+ rlocs_num=0,
+ is_src_dst=0,
+ is_add=1):
return self.api(
self.papi.lisp_add_del_remote_mapping,
{
@@ -2762,14 +2690,14 @@ class VppPapiProvider(object):
'is_src_dst': is_src_dst,
})
- def lisp_adjacency(self,
- leid,
- reid,
- leid_len,
- reid_len,
- eid_type,
- is_add=1,
- vni=0):
+ def lisp_add_del_adjacency(self,
+ leid,
+ reid,
+ leid_len,
+ reid_len,
+ eid_type,
+ is_add=1,
+ vni=0):
return self.api(
self.papi.lisp_add_del_adjacency,
{
@@ -3562,12 +3490,12 @@ class VppPapiProvider(object):
def ipsec_backend_dump(self):
return self.api(self.papi.ipsec_backend_dump, {})
- def app_namespace_add(self,
- namespace_id,
- ip4_fib_id=0,
- ip6_fib_id=0,
- sw_if_index=0xFFFFFFFF,
- secret=0):
+ def app_namespace_add_del(self,
+ namespace_id,
+ ip4_fib_id=0,
+ ip6_fib_id=0,
+ sw_if_index=0xFFFFFFFF,
+ secret=0):
return self.api(
self.papi.app_namespace_add_del,
{'secret': secret,