X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_memif.py;h=6a97c2b988410545f4bc22dba8d854c1b1dab236;hb=5163d5981068e49cb26616da6163136c9fafd969;hp=4ad9ffde4d70f6242bbff2f6756cfa0ff272e2f2;hpb=3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934;p=vpp.git diff --git a/test/vpp_memif.py b/test/vpp_memif.py index 4ad9ffde4d7..6a97c2b9884 100644 --- a/test/vpp_memif.py +++ b/test/vpp_memif.py @@ -1,24 +1,13 @@ import socket - -import six +from ipaddress import IPv4Network from vpp_object import VppObject - - -class MEMIF_ROLE: - MASTER = 0 - SLAVE = 1 - - -class MEMIF_MODE: - ETHERNET = 0 - IP = 1 - PUNT_INJECT = 2 +from vpp_papi import VppEnum def get_if_dump(dump, sw_if_index): for d in dump: - if (d.sw_if_index == sw_if_index): + if d.sw_if_index == sw_if_index: return d @@ -33,13 +22,11 @@ def remove_all_memif_vpp_config(_test): dump = _test.vapi.memif_socket_filename_dump() for d in dump: if d.socket_id != 0: - _test.vapi.memif_socket_filename_add_del( - 0, d.socket_id, d.socket_filename) + _test.vapi.memif_socket_filename_add_del(0, d.socket_id, d.socket_filename) class VppSocketFilename(VppObject): - def __init__(self, test, socket_id, socket_filename, - add_default_folder=False): + def __init__(self, test, socket_id, socket_filename, add_default_folder=False): self._test = test self.socket_id = socket_id self.socket_filename = socket_filename @@ -50,31 +37,39 @@ class VppSocketFilename(VppObject): def add_vpp_config(self): rv = self._test.vapi.memif_socket_filename_add_del( - 1, self.socket_id, self.socket_filename) + 1, self.socket_id, self.socket_filename + ) if self.add_default_folder: - self.socket_filename = b"%s/%s" % ( - six.ensure_binary(self._test.tempdir, encoding='utf-8'), - self.socket_filename) + self.socket_filename = "%s/%s" % (self._test.tempdir, self.socket_filename) return rv def remove_vpp_config(self): return self._test.vapi.memif_socket_filename_add_del( - 0, self.socket_id, self.socket_filename) + 0, self.socket_id, self.socket_filename + ) def query_vpp_config(self): return self._test.vapi.memif_socket_filename_dump() - def __str__(self): - return self.object_id() - def object_id(self): - return "%d" % (self.socket_id) + return "socket-filename-%d-%s" % (self.socket_id, self.socket_filename) class VppMemif(VppObject): - def __init__(self, test, role, mode, rx_queues=0, tx_queues=0, if_id=0, - socket_id=0, secret="", ring_size=0, buffer_size=0, - hw_addr=""): + def __init__( + self, + test, + role, + mode, + rx_queues=0, + tx_queues=0, + if_id=0, + socket_id=0, + secret="", + ring_size=0, + buffer_size=0, + hw_addr="", + ): self._test = test self.role = role self.mode = mode @@ -87,32 +82,50 @@ class VppMemif(VppObject): self.buffer_size = buffer_size self.hw_addr = hw_addr self.sw_if_index = None - self.ip4_addr = "192.168.%d.%d" % (self.if_id + 1, self.role + 1) - self.ip4_addr_len = 24 + self.ip_prefix = IPv4Network( + "192.168.%d.%d/24" % (self.if_id + 1, self.role + 1), strict=False + ) def add_vpp_config(self): - rv = self._test.vapi.memif_create(self.role, self.mode, self.rx_queues, - self.tx_queues, self.if_id, - self.socket_id, self.secret, - self.ring_size, self.buffer_size, - self.hw_addr) - self.sw_if_index = rv.sw_if_index + rv = self._test.vapi.memif_create( + role=self.role, + mode=self.mode, + rx_queues=self.rx_queues, + tx_queues=self.tx_queues, + id=self.if_id, + socket_id=self.socket_id, + secret=self.secret, + ring_size=self.ring_size, + buffer_size=self.buffer_size, + hw_addr=self.hw_addr, + ) + try: + self.sw_if_index = rv.sw_if_index + except AttributeError: + # rv doesn't have .sw_if_index attribute + raise AttributeError("%s %s" % (self, rv)) + return self.sw_if_index def admin_up(self): if self.sw_if_index: - return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 1) + return self._test.vapi.sw_interface_set_flags( + sw_if_index=self.sw_if_index, flags=1 + ) def admin_down(self): if self.sw_if_index: - return self._test.vapi.sw_interface_set_flags(self.sw_if_index, 0) + return self._test.vapi.sw_interface_set_flags( + sw_if_index=self.sw_if_index, flags=0 + ) def wait_for_link_up(self, timeout, step=1): if not self.sw_if_index: return False while True: dump = self.query_vpp_config() - if dump.link_up_down == 1: + f = VppEnum.vl_api_if_status_flags_t.IF_STATUS_API_FLAG_LINK_UP + if dump.flags & f: return True self._test.sleep(step) timeout -= step @@ -121,9 +134,8 @@ class VppMemif(VppObject): def config_ip4(self): return self._test.vapi.sw_interface_add_del_address( - sw_if_index=self.sw_if_index, address=socket.inet_pton( - socket.AF_INET, self.ip4_addr), - address_length=self.ip4_addr_len) + sw_if_index=self.sw_if_index, prefix=self.ip_prefix + ) def remove_vpp_config(self): self._test.vapi.memif_delete(self.sw_if_index) @@ -135,9 +147,6 @@ class VppMemif(VppObject): dump = self._test.vapi.memif_dump() return get_if_dump(dump, self.sw_if_index) - def __str__(self): - return self.object_id() - def object_id(self): if self.sw_if_index: return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)