From eddd8e3588561039985b27edf059db6033bfdfab Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 12 May 2021 21:43:59 -0400 Subject: tests: move test source to vpp/test - Generate copyright year and version instead of using hard-coded data Type: refactor Signed-off-by: Dave Wallace Change-Id: I6058f5025323b3aa483f5df4a2c4371e27b5914e --- src/plugins/memif/test/test_memif.py | 308 ----------------------------------- src/plugins/memif/test/vpp_memif.py | 140 ---------------- 2 files changed, 448 deletions(-) delete mode 100644 src/plugins/memif/test/test_memif.py delete mode 100644 src/plugins/memif/test/vpp_memif.py (limited to 'src/plugins/memif') diff --git a/src/plugins/memif/test/test_memif.py b/src/plugins/memif/test/test_memif.py deleted file mode 100644 index fc7cf9b2e7e..00000000000 --- a/src/plugins/memif/test/test_memif.py +++ /dev/null @@ -1,308 +0,0 @@ -import socket -import unittest - -from scapy.layers.l2 import Ether -from scapy.layers.inet import IP, ICMP - -from framework import VppTestCase, VppTestRunner, running_extended_tests -from framework import tag_run_solo -from remote_test import RemoteClass, RemoteVppTestCase -from vpp_memif import remove_all_memif_vpp_config, \ - VppSocketFilename, VppMemif -from vpp_ip_route import VppIpRoute, VppRoutePath -from vpp_papi import VppEnum - - -@tag_run_solo -class TestMemif(VppTestCase): - """ Memif Test Case """ - remote_class = RemoteVppTestCase - - @classmethod - def get_cpus_required(cls): - return (super().get_cpus_required() + - cls.remote_class.get_cpus_required()) - - @classmethod - def assign_cpus(cls, cpus): - remote_cpus = cpus[:cls.remote_class.get_cpus_required()] - my_cpus = cpus[cls.remote_class.get_cpus_required():] - cls.remote_class.assign_cpus(remote_cpus) - super().assign_cpus(my_cpus) - - @classmethod - def setUpClass(cls): - # fork new process before client connects to VPP - cls.remote_test = RemoteClass(cls.remote_class) - cls.remote_test.start_remote() - cls.remote_test.set_request_timeout(10) - super(TestMemif, cls).setUpClass() - cls.remote_test.setUpClass(cls.tempdir) - cls.create_pg_interfaces(range(1)) - for pg in cls.pg_interfaces: - pg.config_ip4() - pg.admin_up() - pg.resolve_arp() - - @classmethod - def tearDownClass(cls): - cls.remote_test.tearDownClass() - cls.remote_test.quit_remote() - for pg in cls.pg_interfaces: - pg.unconfig_ip4() - pg.set_table_ip4(0) - pg.admin_down() - super(TestMemif, cls).tearDownClass() - - def tearDown(self): - remove_all_memif_vpp_config(self) - remove_all_memif_vpp_config(self.remote_test) - super(TestMemif, self).tearDown() - - def _check_socket_filename(self, dump, socket_id, filename): - for d in dump: - if (d.socket_id == socket_id) and ( - d.socket_filename == filename): - return True - return False - - def test_memif_socket_filename_add_del(self): - """ Memif socket filename add/del """ - - # dump default socket filename - dump = self.vapi.memif_socket_filename_dump() - self.assertTrue( - self._check_socket_filename( - dump, 0, "%s/memif.sock" % self.tempdir)) - - memif_sockets = [] - # existing path - memif_sockets.append( - VppSocketFilename( - self, 1, "%s/memif1.sock" % self.tempdir)) - # default path (test tempdir) - memif_sockets.append( - VppSocketFilename( - self, - 2, - "memif2.sock", - add_default_folder=True)) - # create new folder in default folder - memif_sockets.append( - VppSocketFilename( - self, - 3, - "sock/memif3.sock", - add_default_folder=True)) - - for sock in memif_sockets: - sock.add_vpp_config() - dump = sock.query_vpp_config() - self.assertTrue( - self._check_socket_filename( - dump, - sock.socket_id, - sock.socket_filename)) - - for sock in memif_sockets: - sock.remove_vpp_config() - - dump = self.vapi.memif_socket_filename_dump() - self.assertTrue( - self._check_socket_filename( - dump, 0, "%s/memif.sock" % self.tempdir)) - - def _create_delete_test_one_interface(self, memif): - memif.add_vpp_config() - - dump = memif.query_vpp_config() - - self.assertTrue(dump) - self.assertEqual(dump.sw_if_index, memif.sw_if_index) - self.assertEqual(dump.role, memif.role) - self.assertEqual(dump.mode, memif.mode) - if (memif.socket_id is not None): - self.assertEqual(dump.socket_id, memif.socket_id) - - memif.remove_vpp_config() - - dump = memif.query_vpp_config() - - self.assertFalse(dump) - - def _connect_test_one_interface(self, memif): - self.assertTrue(memif.wait_for_link_up(5)) - dump = memif.query_vpp_config() - - if memif.role == VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE: - self.assertEqual(dump.ring_size, memif.ring_size) - self.assertEqual(dump.buffer_size, memif.buffer_size) - else: - self.assertEqual(dump.ring_size, 1) - self.assertEqual(dump.buffer_size, 0) - - def _connect_test_interface_pair(self, memif0, memif1): - memif0.add_vpp_config() - memif1.add_vpp_config() - - memif0.admin_up() - memif1.admin_up() - - self._connect_test_one_interface(memif0) - self._connect_test_one_interface(memif1) - - memif0.remove_vpp_config() - memif1.remove_vpp_config() - - def test_memif_create_delete(self): - """ Memif create/delete interface """ - - memif = VppMemif( - self, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET) - self._create_delete_test_one_interface(memif) - memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_MASTER - self._create_delete_test_one_interface(memif) - - def test_memif_create_custom_socket(self): - """ Memif create with non-default socket filename """ - - memif_sockets = [] - # existing path - memif_sockets.append( - VppSocketFilename( - self, 1, "%s/memif1.sock" % self.tempdir)) - # default path (test tempdir) - memif_sockets.append( - VppSocketFilename( - self, - 2, - "memif2.sock", - add_default_folder=True)) - # create new folder in default folder - memif_sockets.append( - VppSocketFilename( - self, - 3, - "sock/memif3.sock", - add_default_folder=True)) - - memif = VppMemif( - self, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET) - - for sock in memif_sockets: - sock.add_vpp_config() - memif.socket_id = sock.socket_id - memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE - self._create_delete_test_one_interface(memif) - memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_MASTER - self._create_delete_test_one_interface(memif) - - def test_memif_connect(self): - """ Memif connect """ - memif = VppMemif( - self, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET, - ring_size=1024, - buffer_size=2048, - secret="abc") - - remote_socket = VppSocketFilename(self.remote_test, 1, - "%s/memif.sock" % self.tempdir) - remote_socket.add_vpp_config() - - remote_memif = VppMemif( - self.remote_test, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_MASTER, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET, - socket_id=1, - ring_size=1024, - buffer_size=2048, - secret="abc") - - self._connect_test_interface_pair(memif, remote_memif) - - memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_MASTER - remote_memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE - - self._connect_test_interface_pair(memif, remote_memif) - - def _create_icmp(self, pg, memif, num): - pkts = [] - for i in range(num): - pkt = (Ether(dst=pg.local_mac, src=pg.remote_mac) / - IP(src=pg.remote_ip4, - dst=str(memif.ip_prefix.network_address)) / - ICMP(id=memif.if_id, type='echo-request', seq=i)) - pkts.append(pkt) - return pkts - - def _verify_icmp(self, pg, memif, rx, seq): - ip = rx[IP] - self.assertEqual(ip.src, str(memif.ip_prefix.network_address)) - self.assertEqual(ip.dst, pg.remote_ip4) - self.assertEqual(ip.proto, 1) - icmp = rx[ICMP] - self.assertEqual(icmp.type, 0) # echo-reply - self.assertEqual(icmp.id, memif.if_id) - self.assertEqual(icmp.seq, seq) - - def test_memif_ping(self): - """ Memif ping """ - - memif = VppMemif( - self, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET) - - remote_socket = VppSocketFilename(self.remote_test, 1, - "%s/memif.sock" % self.tempdir) - remote_socket.add_vpp_config() - - remote_memif = VppMemif( - self.remote_test, - VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_MASTER, - VppEnum.vl_api_memif_mode_t.MEMIF_MODE_API_ETHERNET, - socket_id=1) - - memif.add_vpp_config() - memif.config_ip4() - memif.admin_up() - - remote_memif.add_vpp_config() - remote_memif.config_ip4() - remote_memif.admin_up() - - self.assertTrue(memif.wait_for_link_up(5)) - self.assertTrue(remote_memif.wait_for_link_up(5)) - - # add routing to remote vpp - route = VppIpRoute(self.remote_test, self.pg0._local_ip4_subnet, 24, - [VppRoutePath(memif.ip_prefix.network_address, - 0xffffffff)], - register=False) - - route.add_vpp_config() - - # create ICMP echo-request from local pg to remote memif - packet_num = 10 - pkts = self._create_icmp(self.pg0, remote_memif, packet_num) - - self.pg0.add_stream(pkts) - self.pg_enable_capture(self.pg_interfaces) - self.pg_start() - capture = self.pg0.get_capture(packet_num, timeout=2) - seq = 0 - for c in capture: - self._verify_icmp(self.pg0, remote_memif, c, seq) - seq += 1 - - route.remove_vpp_config() - - -if __name__ == '__main__': - unittest.main(testRunner=VppTestRunner) diff --git a/src/plugins/memif/test/vpp_memif.py b/src/plugins/memif/test/vpp_memif.py deleted file mode 100644 index 226f8af72b5..00000000000 --- a/src/plugins/memif/test/vpp_memif.py +++ /dev/null @@ -1,140 +0,0 @@ -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) -- cgit 1.2.3-korg