X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=test%2Fvpp_papi_provider.py;h=789e3c083d58e4c04e53122fdf68e2196a2d8a29;hp=a3d20bf30885613a3307cde2e320671f9d364923;hb=e5b94dded;hpb=f4749ca4d26206bb16cced12be7e73ab7b9cdf74 diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index a3d20bf3088..789e3c083d5 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -10,29 +10,11 @@ import time from collections import deque from six import moves, iteritems -from vpp_papi import VPP, mac_pton +from vpp_papi import VPPApiClient, mac_pton from hook import Hook from vpp_ip_route import MPLS_IETF_MAX_LABEL, MPLS_LABEL_INVALID -class QOS_SOURCE: - EXT = 0 - VLAN = 1 - MPLS = 2 - IP = 3 - - -class SYSLOG_SEVERITY: - EMERG = 0 - ALERT = 1 - CRIT = 2 - ERR = 3 - WARN = 4 - NOTICE = 5 - INFO = 6 - DBG = 7 - - # # Dictionary keyed on message name to override default values for # named parameters @@ -45,33 +27,24 @@ defaultmapping = { 'acl_interface_list_dump': {'sw_if_index': 4294967295, }, 'app_namespace_add_del': {'sw_if_index': 4294967295, }, 'bd_ip_mac_add_del': {'is_add': 1, }, + 'bfd_udp_add': {'is_authenticated': False, 'bfd_key_id': None, + 'conf_key_id': None}, + 'bfd_udp_auth_activate': {'bfd_key_id': None, 'conf_key_id': None, + 'is_delayed': False}, 'bier_disp_entry_add_del': {'next_hop_rpf_id': -1, 'next_hop_is_ip4': 1, 'is_add': 1, }, 'bier_disp_table_add_del': {'is_add': 1, }, 'bier_imp_add': {'is_add': 1, }, 'bier_route_add_del': {'is_add': 1, }, 'bier_table_add_del': {'is_add': 1, }, + 'bond_create': {'mac_address': '', 'id': 0xFFFFFFFF}, 'bridge_domain_add_del': {'flood': 1, 'uu_flood': 1, 'forward': 1, 'learn': 1, 'is_add': 1, }, 'bvi_create': {'user_instance': 4294967295, }, 'bvi_delete': {}, - 'classify_add_del_table': {'match_n_vectors': 1, 'table_index': 4294967295, - 'nbuckets': 2, 'memory_size': 2097152, - 'next_table_index': 4294967295, - 'miss_next_index': 4294967295, }, - 'dhcp6_client_enable_disable': {'enable': 1, }, - 'dhcp6_clients_enable_disable': {'enable': 1, }, - 'dhcp6_pd_client_enable_disable': {'enable': 1, }, - 'dhcp6_send_client_message': {'server_index': 4294967295, 'mrc': 1, }, - 'dhcp_client_config': {'is_add': 1, 'set_broadcast_flag': 1, }, - 'dhcp_proxy_config': {'is_add': 1, }, - 'dhcp_proxy_set_vss': {'vss_type': 255, 'is_add': 1, }, 'gbp_subnet_add_del': {'sw_if_index': 4294967295, 'epg_id': 65535, }, 'geneve_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1, 'decap_next_index': 4294967295, }, - 'gre_tunnel_add_del': {'instance': 4294967295, 'is_add': 1, }, - 'gtpu_add_del_tunnel': {'is_add': 1, 'mcast_sw_if_index': 4294967295, - 'decap_next_index': 4294967295, }, 'input_acl_set_interface': {'ip4_table_index': 4294967295, 'ip6_table_index': 4294967295, 'l2_table_index': 4294967295, }, @@ -79,15 +52,13 @@ defaultmapping = { 'ip6nd_send_router_solicitation': {'irt': 1, 'mrt': 120, }, 'ip_add_del_route': {'next_hop_sw_if_index': 4294967295, 'next_hop_weight': 1, 'next_hop_via_label': 1048576, - 'next_hop_id': 4294967295, 'classify_table_index': 4294967295, 'is_add': 1, }, 'ip_mroute_add_del': {'is_add': 1, }, 'ip_neighbor_add_del': {'is_add': 1, }, 'ip_punt_police': {'is_add': 1, }, 'ip_punt_redirect': {'is_add': 1, }, - 'ip_table_add_del': {'is_add': 1, }, + 'ip_route_add_del': {'is_add': 1, }, 'ip_unnumbered_dump': {'sw_if_index': 4294967295, }, - 'ipip_add_tunnel': {'is_ipv6': 1, 'instance': 4294967295, }, 'ipsec_interface_add_del_spd': {'is_add': 1, }, 'ipsec_sad_entry_add_del': {'is_add': 1, }, 'ipsec_spd_add_del': {'is_add': 1, }, @@ -128,10 +99,6 @@ defaultmapping = { 'policer_add_del': {'is_add': 1, 'conform_action_type': 1, }, 'proxy_arp_add_del': {'is_add': 1, }, 'proxy_arp_intfc_enable_disable': {'is_enable': 1, }, - 'punt_socket_register': {'protocol': 17, 'header_version': 1, - 'is_ip4': 1, }, - 'punt_socket_deregister': {'protocol': 17, 'is_ip4': 1, }, - 'punt_socket_dump': {'is_ip6': 1, }, 'set_ip_flow_hash': {'src': 1, 'dst': 1, 'sport': 1, 'dport': 1, 'proto': 1, }, 'set_ipfix_exporter': {'collector_port': 4739, }, @@ -153,23 +120,24 @@ defaultmapping = { 'vxlan_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1, 'decap_next_index': 4294967295, 'instance': 4294967295, }, - 'vxlan_gbp_tunnel_add_del': {'mcast_sw_if_index': 4294967295, 'is_add': 1, - 'instance': 4294967295, }, 'vxlan_gbp_tunnel_dump': {'sw_if_index': 4294967295, }, 'vxlan_gpe_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1, 'protocol': 3, }, 'want_bfd_events': {'enable_disable': 1, }, - 'want_dhcp6_pd_reply_events': {'enable_disable': 1, }, - 'want_dhcp6_reply_events': {'enable_disable': 1, }, 'want_igmp_events': {'enable': 1, }, 'want_interface_events': {'enable_disable': 1, }, - 'want_ip4_arp_events': {'enable_disable': 1, 'ip': '0.0.0.0', }, - 'want_ip6_nd_events': {'enable_disable': 1, 'ip': '::', }, - 'want_ip6_ra_events': {'enable_disable': 1, }, 'want_l2_macs_events': {'enable_disable': 1, }, } +class CliFailedCommandError(Exception): + """ cli command failed.""" + + +class CliSyntaxError(Exception): + """ cli command had a syntax error.""" + + class UnexpectedApiReturnValueError(Exception): """ exception raised when the API return value is unexpected """ pass @@ -191,22 +159,21 @@ class VppPapiProvider(object): self._expect_api_retval = self._zero self._expect_stack = [] - install_dir = os.getenv('VPP_INSTALL_PATH') - - # Vapi requires 'VPP_API_DIR', not set when run from Makefile. - if 'VPP_API_DIR' not in os.environ: - os.environ['VPP_API_DIR'] = os.getenv('VPP_INSTALL_PATH') + # install_dir is a class attribute. We need to set it before + # calling the constructor. + VPPApiClient.apidir = os.getenv('VPP_INSTALL_PATH') use_socket = False try: if os.environ['SOCKET'] == '1': use_socket = True - except: + except KeyError: pass - self.vpp = VPP(logger=test_class.logger, - read_timeout=read_timeout, - use_socket=use_socket, - server_address=test_class.api_sock) + + self.vpp = VPPApiClient(logger=test_class.logger, + read_timeout=read_timeout, + use_socket=use_socket, + server_address=test_class.api_sock) self._events = deque() def __enter__(self): @@ -290,7 +257,7 @@ class VppPapiProvider(object): for i, o in enumerate(fields[3:]): try: d[o] = a[i] - except: + except BaseException: break # Default override @@ -346,7 +313,7 @@ class VppPapiProvider(object): if hasattr(reply, 'retval') and reply.retval != expected_retval: msg = "API call failed, expected %d return value instead " \ "of %d in %s" % (expected_retval, reply.retval, - moves.reprlib.repr(reply)) + repr(reply)) self.test_class.logger.info(msg) raise UnexpectedApiReturnValueError(msg) else: @@ -356,17 +323,32 @@ class VppPapiProvider(object): self.hook.after_api(api_fn.__name__, api_args) return reply - def cli(self, cli): + def cli_return_response(self, cli): """ Execute a CLI, calling the before/after hooks appropriately. + Return the reply without examining it :param cli: CLI to execute - :returns: CLI output + :returns: response object """ self.hook.before_cli(cli) cli += '\n' r = self.papi.cli_inband(cmd=cli) self.hook.after_cli(cli) + return r + + def cli(self, cli): + """ Execute a CLI, calling the before/after hooks appropriately. + + :param cli: CLI to execute + :returns: CLI output + + """ + r = self.cli_return_response(cli) + if r.retval == -156: + raise CliSyntaxError(r.reply) + if r.retval != 0: + raise CliFailedCommandError(r.reply) if hasattr(r, 'reply'): return r.reply @@ -376,24 +358,7 @@ class VppPapiProvider(object): :param cli: CLI to execute :returns: CLI output """ - return cli + "\n" + str(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, - {'enable_disable': enable_disable, - 'ip': ip, - 'pid': os.getpid(), }) - - def want_ip6_nd_events(self, enable_disable=1, ip="::"): - return self.api(self.papi.want_ip6_nd_events, - {'enable_disable': enable_disable, - 'ip': ip, - 'pid': os.getpid(), }) - - def want_ip6_ra_events(self, enable_disable=1): - return self.api(self.papi.want_ip6_ra_events, - {'enable_disable': enable_disable, - 'pid': os.getpid(), }) + return cli + "\n" + self.cli(cli) def ip6nd_send_router_solicitation(self, sw_if_index, irt=1, mrt=120, mrc=0, mrd=0): @@ -418,57 +383,6 @@ class VppPapiProvider(object): 'learn_limit': learn_limit, 'pid': os.getpid(), }) - def want_dhcp6_reply_events(self, enable_disable=1): - return self.api(self.papi.want_dhcp6_reply_events, - {'enable_disable': enable_disable, - 'pid': os.getpid()}) - - def want_dhcp6_pd_reply_events(self, enable_disable=1): - return self.api(self.papi.want_dhcp6_pd_reply_events, - {'enable_disable': enable_disable, - 'pid': os.getpid()}) - - def dhcp6_pd_send_client_message(self, msg_type, sw_if_index, T1, T2, - prefixes, server_index=0xFFFFFFFF, - irt=0, mrt=0, mrc=1, mrd=0, stop=0, - ): - return self.api(self.papi.dhcp6_pd_send_client_message, - {'sw_if_index': sw_if_index, - 'server_index': server_index, - 'irt': irt, - 'mrt': mrt, - 'mrc': mrc, - 'mrd': mrd, - 'stop': stop, - 'msg_type': msg_type, - 'T1': T1, - 'T2': T2, - 'n_prefixes': len(prefixes), - 'prefixes': prefixes}) - - def dhcp6_client_enable_disable(self, sw_if_index, prefix_group='', - enable=1): - return self.api(self.papi.dhcp6_client_enable_disable, - {'sw_if_index': sw_if_index, - 'enable': enable}) - - def dhcp6_pd_client_enable_disable(self, sw_if_index, prefix_group='', - enable=1): - return self.api(self.papi.dhcp6_pd_client_enable_disable, - {'sw_if_index': sw_if_index, - 'prefix_group': prefix_group, - 'enable': enable}) - - def ip6_add_del_address_using_prefix(self, sw_if_index, address, - prefix_length, prefix_group, - is_add=1): - return self.api(self.papi.ip6_add_del_address_using_prefix, - {'sw_if_index': sw_if_index, - 'prefix_group': prefix_group, - 'address': address, - 'prefix_length': prefix_length, - 'is_add': is_add}) - 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, @@ -518,6 +432,13 @@ class VppPapiProvider(object): return self.api(self.papi.create_loopback, {'mac_address': mac}) + def ip_route_dump(self, table_id, is_ip6=False): + return self.api(self.papi.ip_route_dump, + {'table': { + 'table_id': table_id, + 'is_ip6': is_ip6 + }}) + def ip_neighbor_add_del(self, sw_if_index, mac_address, @@ -579,41 +500,7 @@ class VppPapiProvider(object): return self.api( self.papi.proxy_arp_intfc_enable_disable, {'sw_if_index': sw_if_index, - 'enable_disable': is_enable - } - ) - - def gre_tunnel_add_del(self, - src, - dst, - outer_fib_id=0, - tunnel_type=0, - instance=0xFFFFFFFF, - session_id=0, - is_add=1): - """ Add a GRE tunnel - - :param src_address: - :param dst_address: - :param outer_fib_id: (Default value = 0) - :param tunnel_type: (Default value = 0) - :param instance: (Default value = 0xFFFFFFFF) - :param session_id: (Default value = 0) - :param is_add: (Default value = 1) - :param is_ipv6: (Default value = 0) - """ - - return self.api( - self.papi.gre_tunnel_add_del, - {'is_add': is_add, - 'tunnel': - { - 'type': tunnel_type, - 'instance': instance, - 'src': src, - 'dst': dst, - 'outer_fib_id': outer_fib_id, - 'session_id': session_id} + 'enable': is_enable } ) @@ -643,6 +530,26 @@ class VppPapiProvider(object): } }) + def udp_encap_del(self, id): + return self.api(self.papi.udp_encap_del, {'id': id}) + + 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_route_dump(self, table_id): + return self.api(self.papi.mpls_route_dump, + {'table': { + 'mt_table_id': table_id + }}) + + def mpls_table_dump(self): + return self.api(self.papi.mpls_table_dump, {}) + def mpls_table_add_del( self, table_id, @@ -656,17 +563,43 @@ class VppPapiProvider(object): return self.api( self.papi.mpls_table_add_del, - {'mt_table_id': table_id, + {'mt_table': + { + 'mt_table_id': table_id, + }, 'mt_is_add': is_add}) + def mpls_route_add_del(self, + table_id, + label, + eos, + eos_proto, + is_multicast, + paths, + is_add, + is_multipath): + """ MPLS Route add/del """ + return self.api( + self.papi.mpls_route_add_del, + {'mr_route': + { + 'mr_table_id': table_id, + 'mr_label': label, + 'mr_eos': eos, + 'mr_eos_proto': eos_proto, + 'mr_is_multicast': is_multicast, + 'mr_n_paths': len(paths), + 'mr_paths': paths, + }, + 'mr_is_add': is_add, + 'mr_is_multipath': is_multipath}) + def mpls_ip_bind_unbind( self, label, - dst_address, - dst_address_length, + prefix, table_id=0, ip_table_id=0, - is_ip4=1, is_bind=1): """ """ @@ -676,219 +609,28 @@ class VppPapiProvider(object): 'mb_label': label, 'mb_ip_table_id': ip_table_id, 'mb_is_bind': is_bind, - 'mb_is_ip4': is_ip4, - 'mb_address_length': dst_address_length, - 'mb_address': dst_address}) + 'mb_prefix': prefix}) def mpls_tunnel_add_del( self, tun_sw_if_index, - next_hop_proto_is_ip4, - next_hop_address, - next_hop_sw_if_index=0xFFFFFFFF, - next_hop_table_id=0, - next_hop_weight=1, - next_hop_n_out_labels=0, - next_hop_out_label_stack=[], - next_hop_via_label=MPLS_LABEL_INVALID, + paths, is_add=1, l2_only=0, is_multicast=0): """ - - :param dst_address_length: - :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) - :param dst_address: - :param next_hop_address: - :param next_hop_sw_if_index: (Default value = 0xFFFFFFFF) - :param vrf_id: (Default value = 0) - :param lookup_in_vrf: (Default value = 0) - :param classify_table_index: (Default value = 0xFFFFFFFF) - :param is_add: (Default value = 1) - :param is_drop: (Default value = 0) - :param is_ipv6: (Default value = 0) - :param is_local: (Default value = 0) - :param is_classify: (Default value = 0) - :param is_multipath: (Default value = 0) - :param is_resolve_host: (Default value = 0) - :param is_resolve_attached: (Default value = 0) - :param next_hop_weight: (Default value = 1) - :param is_multicast: (Default value = 0) - """ return self.api( self.papi.mpls_tunnel_add_del, - {'mt_sw_if_index': tun_sw_if_index, - 'mt_is_add': is_add, - 'mt_l2_only': l2_only, - 'mt_is_multicast': is_multicast, - 'mt_next_hop_proto_is_ip4': next_hop_proto_is_ip4, - 'mt_next_hop_weight': next_hop_weight, - 'mt_next_hop': next_hop_address, - 'mt_next_hop_n_out_labels': next_hop_n_out_labels, - 'mt_next_hop_sw_if_index': next_hop_sw_if_index, - 'mt_next_hop_table_id': next_hop_table_id, - 'mt_next_hop_via_label': next_hop_via_label, - 'mt_next_hop_out_label_stack': next_hop_out_label_stack}) - - def bfd_udp_add(self, sw_if_index, desired_min_tx, required_min_rx, - detect_mult, local_addr, peer_addr, is_ipv6=0, - bfd_key_id=None, conf_key_id=None): - if bfd_key_id is None: - return self.api(self.papi.bfd_udp_add, - { - 'sw_if_index': sw_if_index, - 'desired_min_tx': desired_min_tx, - 'required_min_rx': required_min_rx, - 'local_addr': local_addr, - 'peer_addr': peer_addr, - 'is_ipv6': is_ipv6, - 'detect_mult': detect_mult, - }) - else: - return self.api(self.papi.bfd_udp_add, - { - 'sw_if_index': sw_if_index, - 'desired_min_tx': desired_min_tx, - 'required_min_rx': required_min_rx, - 'local_addr': local_addr, - 'peer_addr': peer_addr, - 'is_ipv6': is_ipv6, - 'detect_mult': detect_mult, - 'is_authenticated': 1, - 'bfd_key_id': bfd_key_id, - 'conf_key_id': conf_key_id, - }) - - def bfd_udp_mod(self, sw_if_index, desired_min_tx, required_min_rx, - detect_mult, local_addr, peer_addr, is_ipv6=0): - return self.api(self.papi.bfd_udp_mod, - { - 'sw_if_index': sw_if_index, - 'desired_min_tx': desired_min_tx, - 'required_min_rx': required_min_rx, - 'local_addr': local_addr, - 'peer_addr': peer_addr, - 'is_ipv6': is_ipv6, - 'detect_mult': detect_mult, - }) - - def bfd_udp_auth_activate(self, sw_if_index, local_addr, peer_addr, - is_ipv6=0, bfd_key_id=None, conf_key_id=None, - is_delayed=False): - return self.api(self.papi.bfd_udp_auth_activate, - { - 'sw_if_index': sw_if_index, - 'local_addr': local_addr, - 'peer_addr': peer_addr, - 'is_ipv6': is_ipv6, - 'is_delayed': 1 if is_delayed else 0, - 'bfd_key_id': bfd_key_id, - 'conf_key_id': conf_key_id, - }) - - def bfd_udp_session_set_flags(self, admin_up_down, sw_if_index, local_addr, - peer_addr, is_ipv6=0): - return self.api(self.papi.bfd_udp_session_set_flags, { - 'admin_up_down': admin_up_down, - 'sw_if_index': sw_if_index, - 'local_addr': local_addr, - 'peer_addr': peer_addr, - 'is_ipv6': is_ipv6, - }) - - def want_bfd_events(self, enable_disable=1): - return self.api(self.papi.want_bfd_events, { - 'enable_disable': enable_disable, - 'pid': os.getpid(), - }) - - def bfd_auth_set_key(self, conf_key_id, auth_type, key): - return self.api(self.papi.bfd_auth_set_key, { - 'conf_key_id': conf_key_id, - 'auth_type': auth_type, - 'key': key, - 'key_len': len(key), - }) - - def classify_add_del_table( - self, - is_add, - mask, - match_n_vectors=1, - table_index=0xFFFFFFFF, - nbuckets=2, - memory_size=2097152, - skip_n_vectors=0, - next_table_index=0xFFFFFFFF, - miss_next_index=0xFFFFFFFF, - current_data_flag=0, - current_data_offset=0): - """ - :param is_add: - :param mask: - :param match_n_vectors: (Default value = 1) - :param table_index: (Default value = 0xFFFFFFFF) - :param nbuckets: (Default value = 2) - :param memory_size: (Default value = 2097152) - :param skip_n_vectors: (Default value = 0) - :param next_table_index: (Default value = 0xFFFFFFFF) - :param miss_next_index: (Default value = 0xFFFFFFFF) - :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)) - return self.api( - self.papi.classify_add_del_table, - {'is_add': is_add, - 'table_index': table_index, - 'nbuckets': nbuckets, - 'memory_size': memory_size, - 'skip_n_vectors': skip_n_vectors, - 'match_n_vectors': match_n_vectors, - 'next_table_index': next_table_index, - 'miss_next_index': miss_next_index, - 'current_data_flag': current_data_flag, - 'current_data_offset': current_data_offset, - 'mask_len': mask_len, - 'mask': mask}) - - def classify_add_del_session( - self, - is_add, - table_index, - match, - opaque_index=0xFFFFFFFF, - hit_next_index=0xFFFFFFFF, - advance=0, - action=0, - metadata=0): - """ - :param is_add: - :param table_index: - :param match: - :param opaque_index: (Default value = 0xFFFFFFFF) - :param hit_next_index: (Default value = 0xFFFFFFFF) - :param advance: (Default value = 0) - :param action: (Default value = 0) - :param metadata: (Default value = 0) - """ - - match_len = ((len(match) - 1) / 16 + 1) * 16 - match = match + '\0' * (match_len - len(match)) - return self.api( - self.papi.classify_add_del_session, - {'is_add': is_add, - 'table_index': table_index, - 'hit_next_index': hit_next_index, - 'opaque_index': opaque_index, - 'advance': advance, - 'action': action, - 'metadata': metadata, - 'match_len': match_len, - 'match': match}) + {'mt_is_add': is_add, + 'mt_tunnel': + { + 'mt_sw_if_index': tun_sw_if_index, + 'mt_l2_only': l2_only, + 'mt_is_multicast': is_multicast, + 'mt_n_paths': len(paths), + 'mt_paths': paths, + }}) def input_acl_set_interface( self, @@ -957,98 +699,41 @@ class VppPapiProvider(object): 'udp_checksum': udp_checksum, }) - def dhcp_proxy_config(self, - dhcp_server, - dhcp_src_address, - rx_table_id=0, - server_table_id=0, - is_add=1, - is_ipv6=0): - return self.api( - self.papi.dhcp_proxy_config, - { - 'rx_vrf_id': rx_table_id, - 'server_vrf_id': server_table_id, - 'is_ipv6': is_ipv6, - 'is_add': is_add, - 'dhcp_server': dhcp_server, - 'dhcp_src_address': dhcp_src_address, - }) - - def dhcp_proxy_set_vss(self, - table_id, - vss_type=255, - vpn_ascii_id="", - oui=0, - vpn_index=0, - is_add=1, - is_ip6=0): - return self.api( - self.papi.dhcp_proxy_set_vss, - { - 'tbl_id': table_id, - 'vss_type': vss_type, - 'vpn_ascii_id': vpn_ascii_id, - 'oui': oui, - 'vpn_index': vpn_index, - 'is_add': is_add, - 'is_ipv6': is_ip6, - }) - - 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, - { - 'is_add': is_add, - 'client': { - 'sw_if_index': sw_if_index, - 'hostname': hostname, - 'id': client_id, - 'want_dhcp_event': want_dhcp_events, - 'set_broadcast_flag': set_broadcast_flag, - 'pid': os.getpid()} - }) - def ip_mroute_add_del(self, - src_address, - grp_address, - grp_address_length, + table_id, + prefix, e_flags, - next_hop_afi, - next_hop_sw_if_index, - next_hop_address, - i_flags, - bier_imp=0, - rpf_id=0, - table_id=0, + rpf_id, + paths, is_add=1, - is_ipv6=0, - is_local=0): + is_multipath=1): """ IP Multicast Route add/del """ return self.api( self.papi.ip_mroute_add_del, - {'next_hop_sw_if_index': next_hop_sw_if_index, - 'entry_flags': e_flags, - 'itf_flags': i_flags, - 'table_id': table_id, - 'rpf_id': rpf_id, - 'is_add': is_add, - 'is_ipv6': is_ipv6, - 'is_local': is_local, - 'bier_imp': bier_imp, - 'next_hop_afi': next_hop_afi, - 'grp_address_length': grp_address_length, - 'grp_address': grp_address, - 'src_address': src_address, - 'nh_address': next_hop_address}) + { + 'is_add': is_add, + 'is_multipath': is_multipath, + 'route': { + 'table_id': table_id, + 'entry_flags': e_flags, + 'rpf_id': rpf_id, + 'prefix': prefix, + 'n_paths': len(paths), + 'paths': paths, + } + }) + + def mfib_signal_dump(self): + return self.api(self.papi.mfib_signal_dump, {}) + + def ip_mroute_dump(self, table_id, is_ip6=False): + return self.api(self.papi.ip_mroute_dump, + {'table': { + 'table_id': table_id, + 'is_ip6': is_ip6 + }}) def lisp_enable_disable(self, is_enabled): return self.api( @@ -1174,38 +859,6 @@ class VppPapiProvider(object): 'reid_len': reid_len, }) - def gtpu_add_del_tunnel( - self, - src_addr, - dst_addr, - is_add=1, - is_ipv6=0, - mcast_sw_if_index=0xFFFFFFFF, - encap_vrf_id=0, - decap_next_index=0xFFFFFFFF, - teid=0): - """ - - :param is_add: (Default value = 1) - :param is_ipv6: (Default value = 0) - :param src_addr: - :param dst_addr: - :param mcast_sw_if_index: (Default value = 0xFFFFFFFF) - :param encap_vrf_id: (Default value = 0) - :param decap_next_index: (Default value = 0xFFFFFFFF) - :param teid: (Default value = 0) - - """ - return self.api(self.papi.gtpu_add_del_tunnel, - {'is_add': is_add, - 'is_ipv6': is_ipv6, - 'src_address': src_addr, - 'dst_address': dst_addr, - 'mcast_sw_if_index': mcast_sw_if_index, - 'encap_vrf_id': encap_vrf_id, - 'decap_next_index': decap_next_index, - 'teid': teid}) - def vxlan_gpe_add_del_tunnel( self, src_addr, @@ -1241,45 +894,9 @@ class VppPapiProvider(object): 'protocol': protocol, 'vni': vni}) - def vxlan_gbp_tunnel_add_del( - self, - src, - dst, - mcast_sw_if_index=0xFFFFFFFF, - is_add=1, - is_ipv6=0, - encap_table_id=0, - vni=0, - mode=1, - instance=0xFFFFFFFF): - """ - - :param dst_addr: - :param src_addr: - :param is_add: (Default value = 1) - :param is_ipv6: (Default value = 0) - :param encap_table_id: (Default value = 0) - :param decap_next_index: (Default value = 0xFFFFFFFF) - :param mcast_sw_if_index: (Default value = 0xFFFFFFFF) - :param vni: (Default value = 0) - :param instance: (Default value = 0xFFFFFFFF) - - """ - return self.api(self.papi.vxlan_gbp_tunnel_add_del, - {'is_add': is_add, - 'tunnel': { - 'src': src, - 'dst': dst, - 'mcast_sw_if_index': mcast_sw_if_index, - 'encap_table_id': encap_table_id, - 'vni': vni, - 'instance': instance, - "mode": mode}}) - 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, @@ -1287,7 +904,6 @@ class VppPapiProvider(object): client_mac, session_id=0, is_add=1, - is_ipv6=0, decap_vrf_id=0): """ @@ -1301,7 +917,6 @@ class VppPapiProvider(object): """ return self.api(self.papi.pppoe_add_del_session, {'is_add': is_add, - 'is_ipv6': is_ipv6, 'session_id': session_id, 'client_ip': client_ip, 'decap_vrf_id': decap_vrf_id, @@ -1645,14 +1260,18 @@ class VppPapiProvider(object): """ BIER Route add/del """ return self.api( self.papi.bier_route_add_del, - {'br_tbl_id': {"bt_set": bti.set_id, - "bt_sub_domain": bti.sub_domain_id, - "bt_hdr_len_id": bti.hdr_len_id}, - 'br_bp': bp, - 'br_n_paths': len(paths), - 'br_paths': paths, - 'br_is_add': is_add, - 'br_is_replace': is_replace}) + { + 'br_route': { + 'br_tbl_id': {"bt_set": bti.set_id, + "bt_sub_domain": bti.sub_domain_id, + "bt_hdr_len_id": bti.hdr_len_id}, + 'br_bp': bp, + 'br_n_paths': len(paths), + 'br_paths': paths, + }, + 'br_is_add': is_add, + 'br_is_replace': is_replace + }) def bier_route_dump(self, bti): return self.api( @@ -1717,9 +1336,7 @@ class VppPapiProvider(object): 'bde_bp': bp, 'bde_payload_proto': payload_proto, 'bde_n_paths': 1, - 'bde_paths': [{'next_hop': next_hop, - 'table_id': next_hop_tbl_id, - 'afi': next_hop_afi, + 'bde_paths': [{'table_id': next_hop_tbl_id, 'rpf_id': next_hop_rpf_id, 'n_labels': 0, 'label_stack': lstack}], @@ -1888,7 +1505,6 @@ class VppPapiProvider(object): 'policy': policy, 'priority': priority, 'is_outbound': is_outbound, - 'is_ip_any': is_ip_any } }) @@ -1901,7 +1517,8 @@ class VppPapiProvider(object): remote_spi, crypto_alg, local_crypto_key, remote_crypto_key, integ_alg, local_integ_key, remote_integ_key, is_add=1, esn=0, salt=0, - anti_replay=1, renumber=0, show_instance=0): + anti_replay=1, renumber=0, + udp_encap=0, show_instance=0xffffffff): return self.api( self.papi.ipsec_tunnel_if_add_del, { @@ -1924,22 +1541,10 @@ class VppPapiProvider(object): 'anti_replay': anti_replay, 'renumber': renumber, 'show_instance': show_instance, + 'udp_encap': udp_encap, 'salt': salt }) - def ipsec_gre_tunnel_add_del(self, local_ip, remote_ip, - sa_out, sa_in, is_add=1): - return self.api(self.papi.ipsec_gre_tunnel_add_del, - { - 'is_add': is_add, - 'tunnel': { - 'src': local_ip, - 'dst': remote_ip, - 'local_sa_id': sa_out, - 'remote_sa_id': sa_in - } - }) - def ipsec_select_backend(self, protocol, index): return self.api(self.papi.ipsec_select_backend, {'protocol': protocol, 'index': index}) @@ -1962,27 +1567,18 @@ class VppPapiProvider(object): 'namespace_id': namespace_id, 'namespace_id_len': len(namespace_id)}) - def punt_socket_register(self, port, pathname, protocol=0x11, - header_version=1, is_ip4=1): + def punt_socket_register(self, reg, pathname, + header_version=1): """ Register punt socket """ return self.api(self.papi.punt_socket_register, {'header_version': header_version, - 'punt': {'ipv': is_ip4, - 'l4_protocol': protocol, - 'l4_port': port}, + 'punt': reg, 'pathname': pathname}) - def punt_socket_deregister(self, port, protocol=0x11, is_ip4=1): + def punt_socket_deregister(self, reg): """ Unregister punt socket """ return self.api(self.papi.punt_socket_deregister, - {'punt': {'ipv': is_ip4, - 'l4_protocol': protocol, - 'l4_port': port}}) - - def punt_socket_dump(self, is_ip6=1): - """ Dump punt socket""" - return self.api(self.papi.punt_socket_dump, - {'is_ipv6': is_ip6}) + {'punt': reg}) def gbp_endpoint_add(self, sw_if_index, ips, mac, sclass, flags, tun_src, tun_dst): @@ -2007,8 +1603,7 @@ class VppPapiProvider(object): 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, @@ -2030,7 +1625,7 @@ class VppPapiProvider(object): return self.api(self.papi.gbp_endpoint_group_del, {'sclass': sclass}) - def gbp_bridge_domain_add(self, bd_id, flags, + def gbp_bridge_domain_add(self, bd_id, rd_id, flags, bvi_sw_if_index, uu_fwd_sw_if_index, bm_flood_sw_if_index): @@ -2042,7 +1637,8 @@ class VppPapiProvider(object): 'bvi_sw_if_index': bvi_sw_if_index, 'uu_fwd_sw_if_index': uu_fwd_sw_if_index, 'bm_flood_sw_if_index': bm_flood_sw_if_index, - 'bd_id': bd_id + 'bd_id': bd_id, + 'rd_id': rd_id }}) def gbp_bridge_domain_del(self, bd_id): @@ -2051,6 +1647,7 @@ class VppPapiProvider(object): {'bd_id': bd_id}) def gbp_route_domain_add(self, rd_id, + scope, ip4_table_id, ip6_table_id, ip4_uu_sw_if_index, @@ -2059,6 +1656,7 @@ class VppPapiProvider(object): return self.api(self.papi.gbp_route_domain_add, {'rd': { + 'scope': scope, 'ip4_table_id': ip4_table_id, 'ip6_table_id': ip6_table_id, 'ip4_uu_sw_if_index': ip4_uu_sw_if_index, @@ -2084,14 +1682,15 @@ class VppPapiProvider(object): """ GBP recirc Dump """ return self.api(self.papi.gbp_recirc_dump, {}) - def gbp_ext_itf_add_del(self, is_add, sw_if_index, bd_id, rd_id): + def gbp_ext_itf_add_del(self, is_add, sw_if_index, bd_id, rd_id, flags): """ GBP recirc Add/Del """ return self.api(self.papi.gbp_ext_itf_add_del, {'is_add': is_add, 'ext_itf': { 'sw_if_index': sw_if_index, 'bd_id': bd_id, - 'rd_id': rd_id}}) + 'rd_id': rd_id, + 'flags': flags}}) def gbp_ext_itf_dump(self): """ GBP recirc Dump """ @@ -2113,22 +1712,7 @@ class VppPapiProvider(object): def gbp_subnet_dump(self): """ GBP Subnet Dump """ - return self.api(self.papi.gbp_subnet_dump, - {'_no_type_conversion': True}) - - def gbp_contract_add_del(self, is_add, sclass, dclass, acl_index, - rules, allowed_ethertypes): - """ GBP contract Add/Del """ - return self.api(self.papi.gbp_contract_add_del, - {'is_add': is_add, - 'contract': { - 'acl_index': acl_index, - 'sclass': sclass, - 'dclass': dclass, - 'n_rules': len(rules), - 'rules': rules, - 'n_ether_types': len(allowed_ethertypes), - 'allowed_ethertypes': allowed_ethertypes}}) + return self.api(self.papi.gbp_subnet_dump, {}) def gbp_contract_dump(self): """ GBP contract Dump """ @@ -2157,28 +1741,6 @@ class VppPapiProvider(object): """ GBP VXLAN tunnel add/del """ return self.api(self.papi.gbp_vxlan_tunnel_dump, {}) - def qos_egress_map_update(self, id, outputs): - """ QOS egress map update """ - return self.api(self.papi.qos_egress_map_update, - {'map_id': id, - 'rows': outputs}) - - def qos_egress_map_delete(self, id): - """ QOS egress map delete """ - return self.api(self.papi.qos_egress_map_delete, - {'map_id': id}) - - def qos_mark_enable_disable(self, sw_if_index, - output_source, - map_id, - enable): - """ QOS Mark Enable/Disable """ - return self.api(self.papi.qos_mark_enable_disable, - {'map_id': map_id, - 'sw_if_index': sw_if_index, - 'output_source': output_source, - 'enable': enable}) - def igmp_enable_disable(self, sw_if_index, enable, host): """ Enable/disable IGMP on a given interface """ return self.api(self.papi.igmp_enable_disable, @@ -2234,12 +1796,14 @@ class VppPapiProvider(object): self, mode, lb, + numa_only, use_custom_mac, mac_address='', interface_id=0xFFFFFFFF): """ :param mode: mode :param lb: load balance + :param numa_only: tx on local numa node for lacp mode :param use_custom_mac: use custom mac :param mac_address: mac address :param interface_id: custom interface ID @@ -2248,6 +1812,7 @@ class VppPapiProvider(object): self.papi.bond_create, {'mode': mode, 'lb': lb, + 'numa_only': numa_only, 'use_custom_mac': use_custom_mac, 'mac_address': mac_address, 'id': interface_id @@ -2257,30 +1822,6 @@ class VppPapiProvider(object): return self.api(self.papi.pipe_delete, {'parent_sw_if_index': parent_sw_if_index}) - def memif_create( - self, - role, - mode, - rx_queues=None, - tx_queues=None, - _id=None, - socket_id=None, - secret=None, - ring_size=None, - buffer_size=None, - hw_addr=None): - return self.api(self.papi.memif_create, - {'role': role, - 'mode': mode, - 'rx_queues': rx_queues, - 'tx_queues': tx_queues, - 'id': _id, - 'socket_id': socket_id, - 'secret': secret, - 'ring_size': ring_size, - 'buffer_size': buffer_size, - 'hw_addr': hw_addr}) - def svs_table_add_del(self, af, table_id, is_add=1): return self.api(self.papi.svs_table_add_del, { @@ -2306,3 +1847,10 @@ class VppPapiProvider(object): 'sw_if_index': sw_if_index, 'is_enable': is_enable, }) + + def feature_gso_enable_disable(self, sw_if_index, enable_disable=1): + return self.api(self.papi.feature_gso_enable_disable, + { + 'sw_if_index': sw_if_index, + 'enable_disable': enable_disable, + })