X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_papi_provider.py;h=1c5b6c5084f0e8d8f04a72212b2c40cd4b646c59;hb=5d5f85f5e4003476fb6d9a0ccd6ad58ad90e5138;hp=d1a4eaf7fc67311ce6426419512a675d5ae04ac2;hpb=2df2f75ec52003e3b6addbde5f2e8254a9aee800;p=vpp.git diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index d1a4eaf7fc6..1c5b6c5084f 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -8,13 +8,12 @@ import os import time from collections import deque - +import queue from six import moves, iteritems from vpp_papi import VPPApiClient, mac_pton from hook import Hook from vpp_ip_route import MPLS_IETF_MAX_LABEL, MPLS_LABEL_INVALID - # # Dictionary keyed on message name to override default values for # named parameters @@ -36,7 +35,6 @@ defaultmapping = { 'bridge_domain_add_del': {'flood': 1, 'uu_flood': 1, 'forward': 1, 'learn': 1, 'is_add': 1, }, 'bvi_delete': {}, - '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, }, 'input_acl_set_interface': {'ip4_table_index': 4294967295, @@ -49,7 +47,6 @@ defaultmapping = { 'classify_table_index': 4294967295, 'is_add': 1, }, 'ip_mroute_add_del': {'is_add': 1, }, 'ip_neighbor_add_del': {'is_add': 1, }, - 'ip_route_add_del': {'is_add': 1, }, 'ipsec_interface_add_del_spd': {'is_add': 1, }, 'ipsec_spd_add_del': {'is_add': 1, }, 'ipsec_spd_dump': {'sa_id': 4294967295, }, @@ -82,8 +79,6 @@ defaultmapping = { 'l2_table_index': 4294967295, }, 'pppoe_add_del_session': {'is_add': 1, }, 'policer_add_del': {'is_add': 1, 'conform_action': {'type': 1}, }, - 'set_ip_flow_hash': {'src': 1, 'dst': 1, 'sport': 1, 'dport': 1, - 'proto': 1, }, 'set_ipfix_exporter': {'collector_port': 4739, }, 'sr_policy_add': {'weight': 1, 'is_encap': 1, }, 'sw_interface_add_del_address': {'is_add': 1, }, @@ -98,12 +93,11 @@ defaultmapping = { 'vxlan_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1, 'decap_next_index': 4294967295, 'instance': 4294967295, }, - 'vxlan_gpe_add_del_tunnel': {'mcast_sw_if_index': 4294967295, 'is_add': 1, - 'protocol': 3, }, 'want_bfd_events': {'enable_disable': 1, }, 'want_igmp_events': {'enable': 1, }, 'want_interface_events': {'enable_disable': 1, }, 'want_l2_macs_events': {'enable_disable': 1, 'pid': os.getpid(), }, + 'want_l2_macs_events2': {'enable_disable': 1, 'pid': os.getpid(), }, } @@ -132,10 +126,9 @@ class VppPapiProvider(object): _zero, _negative = range(2) - def __init__(self, name, shm_prefix, test_class, read_timeout): + def __init__(self, name, test_class, read_timeout): self.hook = Hook(test_class) self.name = name - self.shm_prefix = shm_prefix self.test_class = test_class self._expect_api_retval = self._zero self._expect_stack = [] @@ -144,38 +137,35 @@ class VppPapiProvider(object): # calling the constructor. VPPApiClient.apidir = os.getenv('VPP_INSTALL_PATH') - use_socket = False - try: - if os.environ['SOCKET'] == '1': - use_socket = True - except KeyError: - pass - self.vpp = VPPApiClient(logger=test_class.logger, read_timeout=read_timeout, - use_socket=use_socket, - server_address=test_class.api_sock) - self._events = deque() + use_socket=True, + server_address=test_class.get_api_sock_path()) + self._events = queue.Queue() def __enter__(self): return self def assert_negative_api_retval(self): - """ Expect API failure - used with with, e.g.: - with self.vapi.assert_negative_api_retval(): - self.vapi. + """ Expect API failure - used with with, e.g.:: + + with self.vapi.assert_negative_api_retval(): + self.vapi. + + .. """ self._expect_stack.append(self._expect_api_retval) self._expect_api_retval = self._negative return self def assert_zero_api_retval(self): - """ Expect API success - used with with, e.g.: - with self.vapi.assert_negative_api_retval(): - self.vapi. + """ Expect API success - used with with, e.g.:: + + with self.vapi.assert_negative_api_retval(): + self.vapi. - note: this is useful only inside another with block - as success is the default expected value + :note: this is useful only inside another with block + as success is the default expected value """ self._expect_stack.append(self._expect_api_retval) self._expect_api_retval = self._zero @@ -194,9 +184,14 @@ class VppPapiProvider(object): def collect_events(self): """ Collect all events from the internal queue and clear the queue. """ - e = self._events - self._events = deque() - return e + result = [] + while True: + try: + e = self._events.get(block=False) + result.append(e) + except queue.Empty: + return result + return result def wait_for_event(self, timeout, name=None): """ Wait for and return next event. """ @@ -206,28 +201,21 @@ class VppPapiProvider(object): else: self.test_class.logger.debug("Expecting event within %ss", timeout) - if self._events: - self.test_class.logger.debug("Not waiting, event already queued") - limit = time.time() + timeout - while time.time() < limit: - if self._events: - e = self._events.popleft() - if name and type(e).__name__ != name: - raise Exception( - "Unexpected event received: %s, expected: %s" % - (type(e).__name__, name)) - self.test_class.logger.debug("Returning event %s:%s" % - (name, e)) - return e - self.test_class.sleep(0) # yield - raise Exception("Event did not occur within timeout") + try: + e = self._events.get(timeout=timeout) + except queue.Empty: + raise Exception("Event did not occur within timeout") + msgname = type(e).__name__ + if name and msgname != name: + raise Exception("Unexpected event received: %s, expected: %s" + % msgname) + self.test_class.logger.debug("Returning event %s:%s" % (name, e)) + return e def __call__(self, name, event): """ Enqueue event in the internal event queue. """ - # FIXME use the name instead of relying on type(e).__name__ ? - # FIXME #2 if this throws, it is eaten silently, Ole? self.test_class.logger.debug("New event: %s: %s" % (name, event)) - self._events.append(event) + self._events.put(event) def factory(self, name, apifn): def f(*a, **ka): @@ -263,7 +251,14 @@ class VppPapiProvider(object): def connect(self): """Connect the API to VPP""" - self.vpp.connect(self.name, self.shm_prefix) + # This might be called before VPP is prepared to listen to the socket + retries = 0 + while not os.path.exists(self.test_class.get_api_sock_path()): + time.sleep(0.5) + retries += 1 + if retries > 120: + break + self.vpp.connect(self.name[:63]) self.papi = self.vpp.api self.vpp.register_event_callback(self) @@ -415,6 +410,16 @@ class VppPapiProvider(object): 'is_ip6': is_ip6 }}) + def ip_route_v2_dump(self, table_id, is_ip6=False, src=0): + return self.api(self.papi.ip_route_v2_dump, + { + 'src': src, + 'table': { + 'table_id': table_id, + 'is_ip6': is_ip6 + } + }) + def ip_neighbor_add_del(self, sw_if_index, mac_address, @@ -647,45 +652,6 @@ class VppPapiProvider(object): 'is_ip6': is_ip6 }}) - def vxlan_gpe_add_del_tunnel( - self, - src_addr, - dst_addr, - mcast_sw_if_index=0xFFFFFFFF, - is_add=1, - is_ipv6=0, - encap_vrf_id=0, - decap_vrf_id=0, - protocol=3, - vni=0): - """ - - :param local: - :param remote: - :param is_add: (Default value = 1) - :param is_ipv6: (Default value = 0) - :param encap_vrf_id: (Default value = 0) - :param decap_vrf_id: (Default value = 0) - :param mcast_sw_if_index: (Default value = 0xFFFFFFFF) - :param protocol: (Default value = 3) - :param vni: (Default value = 0) - - """ - return self.api(self.papi.vxlan_gpe_add_del_tunnel, - {'is_add': is_add, - 'is_ipv6': is_ipv6, - 'local': src_addr, - 'remote': dst_addr, - 'mcast_sw_if_index': mcast_sw_if_index, - 'encap_vrf_id': encap_vrf_id, - 'decap_vrf_id': decap_vrf_id, - 'protocol': protocol, - 'vni': vni}) - - 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}) - def pppoe_add_del_session( self, client_ip, @@ -840,7 +806,7 @@ class VppPapiProvider(object): :param spd_id - SPD ID to be created in the vpp . mandatory :param is_add - create (1) or delete(0) SPD (Default 1 - add) . - optional + optional :returns: reply from the API """ return self.api( @@ -891,11 +857,12 @@ class VppPapiProvider(object): is_ip_any=0): """ IPSEC policy SPD add/del - Wrapper to configure ipsec SPD policy entries in VPP + :param spd_id: SPD ID for the policy :param local_address_start: local-ip-range start address - :param local_address_stop : local-ip-range stop address + :param local_address_stop: local-ip-range stop address :param remote_address_start: remote-ip-range start address - :param remote_address_stop : remote-ip-range stop address + :param remote_address_stop: remote-ip-range stop address :param local_port_start: (Default value = 0) :param local_port_stop: (Default value = 65535) :param remote_port_start: (Default value = 0) @@ -903,10 +870,10 @@ class VppPapiProvider(object): :param protocol: Any(0), AH(51) & ESP(50) protocol (Default value = 0) :param sa_id: Security Association ID for mapping it to SPD :param policy: bypass(0), discard(1), resolve(2) or protect(3) action - (Default value = 0) + (Default value = 0) :param priority: value for the spd action (Default value = 100) :param is_outbound: flag for inbound(0) or outbound(1) - (Default value = 1) + (Default value = 1) :param is_add: (Default value = 1) """ return self.api( @@ -989,167 +956,6 @@ class VppPapiProvider(object): return self.api(self.papi.punt_socket_deregister, {'punt': reg}) - def gbp_endpoint_add(self, sw_if_index, ips, mac, sclass, flags, - tun_src, tun_dst): - """ GBP endpoint Add """ - return self.api(self.papi.gbp_endpoint_add, - {'endpoint': { - 'sw_if_index': sw_if_index, - 'ips': ips, - 'n_ips': len(ips), - 'mac': mac, - 'sclass': sclass, - 'flags': flags, - 'tun': { - 'src': tun_src, - 'dst': tun_dst, - }}}) - - def gbp_endpoint_del(self, handle): - """ GBP endpoint Del """ - return self.api(self.papi.gbp_endpoint_del, - {'handle': handle}) - - def gbp_endpoint_dump(self): - """ GBP endpoint Dump """ - return self.api(self.papi.gbp_endpoint_dump, {}) - - def gbp_endpoint_group_add(self, vnid, sclass, bd, - rd, uplink_sw_if_index, - retention): - """ GBP endpoint group Add """ - return self.api(self.papi.gbp_endpoint_group_add, - {'epg': - { - 'uplink_sw_if_index': uplink_sw_if_index, - 'bd_id': bd, - 'rd_id': rd, - 'vnid': vnid, - 'sclass': sclass, - 'retention': retention - }}) - - def gbp_endpoint_group_del(self, sclass): - """ GBP endpoint group Del """ - return self.api(self.papi.gbp_endpoint_group_del, - {'sclass': sclass}) - - 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): - """ GBP bridge-domain Add """ - return self.api(self.papi.gbp_bridge_domain_add, - {'bd': - { - 'flags': flags, - '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, - 'rd_id': rd_id - }}) - - def gbp_bridge_domain_del(self, bd_id): - """ GBP bridge-domain Del """ - return self.api(self.papi.gbp_bridge_domain_del, - {'bd_id': bd_id}) - - def gbp_route_domain_add(self, rd_id, - scope, - ip4_table_id, - ip6_table_id, - ip4_uu_sw_if_index, - ip6_uu_sw_if_index): - """ GBP route-domain Add """ - 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, - 'ip6_uu_sw_if_index': ip6_uu_sw_if_index, - 'rd_id': rd_id - }}) - - def gbp_route_domain_del(self, rd_id): - """ GBP route-domain Del """ - return self.api(self.papi.gbp_route_domain_del, - {'rd_id': rd_id}) - - def gbp_recirc_add_del(self, is_add, sw_if_index, sclass, is_ext): - """ GBP recirc Add/Del """ - return self.api(self.papi.gbp_recirc_add_del, - {'is_add': is_add, - 'recirc': { - 'is_ext': is_ext, - 'sw_if_index': sw_if_index, - 'sclass': sclass}}) - - def gbp_recirc_dump(self): - """ 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, 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, - 'flags': flags}}) - - def gbp_ext_itf_dump(self): - """ GBP recirc Dump """ - return self.api(self.papi.gbp_ext_itf_dump, {}) - - def gbp_subnet_add_del(self, is_add, rd_id, - prefix, type, - sw_if_index=0xffffffff, - sclass=0xffff): - """ GBP Subnet Add/Del """ - return self.api(self.papi.gbp_subnet_add_del, - {'is_add': is_add, - 'subnet': { - 'type': type, - 'sw_if_index': sw_if_index, - 'sclass': sclass, - 'prefix': prefix, - 'rd_id': rd_id}}) - - def gbp_subnet_dump(self): - """ GBP Subnet Dump """ - return self.api(self.papi.gbp_subnet_dump, {}) - - def gbp_contract_dump(self): - """ GBP contract Dump """ - return self.api(self.papi.gbp_contract_dump, {}) - - def gbp_vxlan_tunnel_add(self, vni, bd_rd_id, mode, src): - """ GBP VXLAN tunnel add """ - return self.api(self.papi.gbp_vxlan_tunnel_add, - { - 'tunnel': { - 'vni': vni, - 'mode': mode, - 'bd_rd_id': bd_rd_id, - 'src': src - } - }) - - def gbp_vxlan_tunnel_del(self, vni): - """ GBP VXLAN tunnel del """ - return self.api(self.papi.gbp_vxlan_tunnel_del, - { - 'vni': vni, - }) - - def gbp_vxlan_tunnel_dump(self): - """ GBP VXLAN tunnel add/del """ - return self.api(self.papi.gbp_vxlan_tunnel_dump, {}) - 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, @@ -1172,7 +978,7 @@ class VppPapiProvider(object): def igmp_listen(self, filter, sw_if_index, saddrs, gaddr): """ Listen for new (S,G) on specified interface - :param enable: add/del + :param enable: add/delas :param sw_if_index: interface sw index :param saddr: source ip4 addr :param gaddr: group ip4 addr