X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_papi_provider.py;h=ec2f222b54090168c3f0a85fe5de3d353298c697;hb=refs%2Fchanges%2F24%2F28524%2F2;hp=94de500d9f99f83f338b083c0ba2c59b3f2ca245;hpb=c0e9441e79b63ea09d5b282910d104960d45026d;p=vpp.git diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 94de500d9f9..ec2f222b540 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -53,7 +53,6 @@ defaultmapping = { 'ip_punt_redirect': {'is_add': 1, }, 'ip_route_add_del': {'is_add': 1, }, 'ipsec_interface_add_del_spd': {'is_add': 1, }, - 'ipsec_sad_entry_add_del': {'is_add': 1, }, 'ipsec_spd_add_del': {'is_add': 1, }, 'ipsec_spd_dump': {'sa_id': 4294967295, }, 'ipsec_spd_entry_add_del': {'local_port_stop': 65535, @@ -115,6 +114,10 @@ defaultmapping = { } +def as_fn_signature(d): + return ", ".join(f"{k}={v}" for k, v in d.items()) + + class CliFailedCommandError(Exception): """ cli command failed.""" @@ -289,15 +292,19 @@ class VppPapiProvider(object): reply = api_fn(**api_args) if self._expect_api_retval == self._negative: if hasattr(reply, 'retval') and reply.retval >= 0: - msg = "API call passed unexpectedly: expected negative " \ + msg = "%s(%s) passed unexpectedly: expected negative " \ "return value instead of %d in %s" % \ - (reply.retval, moves.reprlib.repr(reply)) + (api_fn.__name__, as_fn_signature(api_args), + reply.retval, + moves.reprlib.repr(reply)) self.test_class.logger.info(msg) raise UnexpectedApiReturnValueError(msg) elif self._expect_api_retval == self._zero: 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, + msg = "%s(%s) failed, expected %d return value instead " \ + "of %d in %s" % (api_fn.__name__, + as_fn_signature(api_args), + expected_retval, reply.retval, repr(reply)) self.test_class.logger.info(msg) raise UnexpectedApiReturnValueError(msg) @@ -675,32 +682,6 @@ class VppPapiProvider(object): 'udp_checksum': udp_checksum, }) - def ip_mroute_add_del(self, - table_id, - prefix, - e_flags, - rpf_id, - paths, - is_add=1, - is_multipath=1): - """ - IP Multicast Route add/del - """ - return self.api( - self.papi.ip_mroute_add_del, - { - '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, {}) @@ -711,130 +692,6 @@ class VppPapiProvider(object): 'is_ip6': is_ip6 }}) - def lisp_enable_disable(self, is_enabled): - return self.api( - self.papi.lisp_enable_disable, - { - 'is_en': is_enabled, - }) - - def lisp_add_del_locator_set(self, - ls_name, - is_add=1): - return self.api( - self.papi.lisp_add_del_locator_set, - { - 'is_add': is_add, - 'locator_set_name': ls_name - }) - - 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, - { - 'is_add': is_add, - 'locator_set_name': ls_name, - 'sw_if_index': sw_if_index, - 'priority': priority, - 'weight': weight - }) - - def lisp_locator_dump(self, is_index_set, ls_name=None, ls_index=0): - return self.api( - self.papi.lisp_locator_dump, - { - 'is_index_set': is_index_set, - 'ls_name': ls_name, - 'ls_index': ls_index, - }) - - 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, - { - 'locator_set_name': ls_name, - 'is_add': is_add, - 'eid_type': eid_type, - 'eid': eid, - 'prefix_len': prefix_len, - 'vni': vni, - 'key_id': key_id, - 'key': key - }) - - def lisp_eid_table_dump(self, - eid_set=0, - prefix_length=0, - vni=0, - eid_type=0, - eid=None, - filter_opt=0): - return self.api( - self.papi.lisp_eid_table_dump, - { - 'eid_set': eid_set, - 'prefix_length': prefix_length, - 'vni': vni, - 'eid_type': eid_type, - 'eid': eid, - 'filter': filter_opt, - }) - - 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, - { - 'is_add': is_add, - 'eid_type': eid_type, - 'eid': eid, - 'eid_len': eid_prefix_len, - 'rloc_num': rlocs_num, - 'rlocs': rlocs, - 'vni': vni, - 'is_src_dst': is_src_dst, - }) - - 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, - { - 'is_add': is_add, - 'vni': vni, - 'eid_type': eid_type, - 'leid': leid, - 'reid': reid, - 'leid_len': leid_len, - 'reid_len': reid_len, - }) - def vxlan_gpe_add_del_tunnel( self, src_addr, @@ -1089,60 +946,6 @@ class VppPapiProvider(object): {'spd_index': spd_index if spd_index else 0, 'spd_index_valid': 1 if spd_index else 0}) - def ipsec_sad_entry_add_del(self, - sad_id, - spi, - integrity_algorithm, - integrity_key, - crypto_algorithm, - crypto_key, - protocol, - tunnel_src_address='', - tunnel_dst_address='', - flags=0, - salt=0, - is_add=1): - """ IPSEC SA add/del - :param sad_id: security association ID - :param spi: security param index of the SA in decimal - :param integrity_algorithm: - :param integrity_key: - :param crypto_algorithm: - :param crypto_key: - :param protocol: AH(0) or ESP(1) protocol - :param tunnel_src_address: tunnel mode outer src address - :param tunnel_dst_address: tunnel mode outer dst address - :param is_add: - :param is_tunnel: - :** reference /vpp/src/vnet/ipsec/ipsec.h file for enum values of - crypto and ipsec algorithms - """ - return self.api( - self.papi.ipsec_sad_entry_add_del, - { - 'is_add': is_add, - 'entry': - { - 'sad_id': sad_id, - 'spi': spi, - 'tunnel_src': tunnel_src_address, - 'tunnel_dst': tunnel_dst_address, - 'protocol': protocol, - 'integrity_algorithm': integrity_algorithm, - 'integrity_key': { - 'length': len(integrity_key), - 'data': integrity_key, - }, - 'crypto_algorithm': crypto_algorithm, - 'crypto_key': { - 'length': len(crypto_key), - 'data': crypto_key, - }, - 'flags': flags, - 'salt': salt, - } - }) - def ipsec_sa_dump(self, sa_id=None): return self.api(self.papi.ipsec_sa_dump, {'sa_id': sa_id if sa_id else 0xffffffff})