d9b0c6fbf7
Drop pycodestyle for code style checking in favor of black. Black is much faster, stable PEP8 compliant code style checker offering also automatic formatting. It aims to be very stable and produce smallest diffs. It's used by many small and big projects. Running checkstyle with black takes a few seconds with a terse output. Thus, test-checkstyle-diff is no longer necessary. Expand scope of checkstyle to all python files in the repo, replacing test-checkstyle with checkstyle-python. Also, fixstyle-python is now available for automatic style formatting. Note: python virtualenv has been consolidated in test/Makefile, test/requirements*.txt which will eventually be moved to a central location. This is required to simply the automated generation of docker executor images in the CI. Type: improvement Change-Id: I022a326603485f58585e879ac0f697fceefbc9c8 Signed-off-by: Klement Sekera <klement.sekera@gmail.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
155 lines
4.5 KiB
Python
155 lines
4.5 KiB
Python
import socket
|
|
from ipaddress import IPv4Network
|
|
|
|
from vpp_object import VppObject
|
|
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:
|
|
return d
|
|
|
|
|
|
def query_all_memif_vpp_config(_test):
|
|
return _test.vapi.memif_dump()
|
|
|
|
|
|
def remove_all_memif_vpp_config(_test):
|
|
dump = _test.vapi.memif_dump()
|
|
for d in dump:
|
|
_test.vapi.memif_delete(d.sw_if_index)
|
|
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)
|
|
|
|
|
|
class VppSocketFilename(VppObject):
|
|
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
|
|
|
|
# if True insert default socket folder before socket filename,
|
|
# after adding vpp config
|
|
self.add_default_folder = add_default_folder
|
|
|
|
def add_vpp_config(self):
|
|
rv = self._test.vapi.memif_socket_filename_add_del(
|
|
1, self.socket_id, self.socket_filename
|
|
)
|
|
if self.add_default_folder:
|
|
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
|
|
)
|
|
|
|
def query_vpp_config(self):
|
|
return self._test.vapi.memif_socket_filename_dump()
|
|
|
|
def object_id(self):
|
|
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="",
|
|
):
|
|
self._test = test
|
|
self.role = role
|
|
self.mode = mode
|
|
self.rx_queues = rx_queues
|
|
self.tx_queues = tx_queues
|
|
self.if_id = if_id
|
|
self.socket_id = socket_id
|
|
self.secret = secret
|
|
self.ring_size = ring_size
|
|
self.buffer_size = buffer_size
|
|
self.hw_addr = hw_addr
|
|
self.sw_if_index = None
|
|
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(
|
|
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(
|
|
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(
|
|
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()
|
|
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
|
|
if timeout <= 0:
|
|
return False
|
|
|
|
def config_ip4(self):
|
|
return self._test.vapi.sw_interface_add_del_address(
|
|
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)
|
|
self.sw_if_index = None
|
|
|
|
def query_vpp_config(self):
|
|
if not self.sw_if_index:
|
|
return None
|
|
dump = self._test.vapi.memif_dump()
|
|
return get_if_dump(dump, self.sw_if_index)
|
|
|
|
def object_id(self):
|
|
if self.sw_if_index:
|
|
return "%d:%d:%d" % (self.role, self.if_id, self.sw_if_index)
|
|
else:
|
|
return "%d:%d:None" % (self.role, self.if_id)
|