X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_memif.py;h=30819d9949383af16fbed3b495be5a5289719511;hb=08c50e3b7acb932adb1f62002619a1e52207262a;hp=d89e06bfb4be10a374e7f5abc4cba1497576d9cd;hpb=3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934;p=vpp.git diff --git a/test/test_memif.py b/test/test_memif.py index d89e06bfb4b..30819d99493 100644 --- a/test/test_memif.py +++ b/test/test_memif.py @@ -3,24 +3,43 @@ import unittest from scapy.layers.l2 import Ether from scapy.layers.inet import IP, ICMP -import six -from framework import VppTestCase, VppTestRunner, running_extended_tests -from remote_test import RemoteClass, RemoteVppTestCase -from vpp_memif import MEMIF_MODE, MEMIF_ROLE, remove_all_memif_vpp_config, \ - VppSocketFilename, VppMemif +from framework import VppTestCase, VppTestRunner +from framework import tag_run_solo, tag_fixme_debian11, is_distro_debian11 +from asf.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 +@tag_fixme_debian11 class TestMemif(VppTestCase): - """ Memif Test Case """ + """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(RemoteVppTestCase) + cls.remote_test = RemoteClass(cls.remote_class) cls.remote_test.start_remote() cls.remote_test.set_request_timeout(10) super(TestMemif, cls).setUpClass() + if is_distro_debian11 == True and not hasattr(cls, "vpp"): + cls.remote_test.quit_remote() + return cls.remote_test.setUpClass(cls.tempdir) cls.create_pg_interfaces(range(1)) for pg in cls.pg_interfaces: @@ -45,59 +64,47 @@ class TestMemif(VppTestCase): def _check_socket_filename(self, dump, socket_id, filename): for d in dump: - if (d.socket_id == socket_id) and ( - d.socket_filename.rstrip(b"\0") == filename): + 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 filenale add/del """ + """Memif socket filename add/del""" # dump default socket filename dump = self.vapi.memif_socket_filename_dump() self.assertTrue( - self._check_socket_filename( - dump, 0, b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8'))) + self._check_socket_filename(dump, 0, "%s/memif.sock" % self.tempdir) + ) memif_sockets = [] # existing path memif_sockets.append( - VppSocketFilename( - self, 1, b"%s/memif1.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8'))) + VppSocketFilename(self, 1, "%s/memif1.sock" % self.tempdir) + ) # default path (test tempdir) memif_sockets.append( - VppSocketFilename( - self, - 2, - b"memif2.sock", - add_default_folder=True)) + VppSocketFilename(self, 2, "memif2.sock", add_default_folder=True) + ) # create new folder in default folder memif_sockets.append( - VppSocketFilename( - self, - 3, - b"sock/memif3.sock", - add_default_folder=True)) + 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)) + 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, b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8'))) + self._check_socket_filename(dump, 0, "%s/memif.sock" % self.tempdir) + ) def _create_delete_test_one_interface(self, memif): memif.add_vpp_config() @@ -108,7 +115,7 @@ class TestMemif(VppTestCase): 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): + if memif.socket_id is not None: self.assertEqual(dump.socket_id, memif.socket_id) memif.remove_vpp_config() @@ -121,7 +128,7 @@ class TestMemif(VppTestCase): self.assertTrue(memif.wait_for_link_up(5)) dump = memif.query_vpp_config() - if memif.role == MEMIF_ROLE.SLAVE: + 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: @@ -142,80 +149,95 @@ class TestMemif(VppTestCase): memif1.remove_vpp_config() def test_memif_create_delete(self): - """ Memif create/delete interface """ + """Memif create/delete interface""" - memif = VppMemif(self, MEMIF_ROLE.SLAVE, MEMIF_MODE.ETHERNET) + 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 = MEMIF_ROLE.MASTER + 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 create with non-default socket filename""" memif_sockets = [] # existing path memif_sockets.append( - VppSocketFilename( - self, 1, b"%s/memif1.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8'))) + VppSocketFilename(self, 1, "%s/memif1.sock" % self.tempdir) + ) # default path (test tempdir) memif_sockets.append( - VppSocketFilename( - self, - 2, - b"memif2.sock", - add_default_folder=True)) + VppSocketFilename(self, 2, "memif2.sock", add_default_folder=True) + ) # create new folder in default folder memif_sockets.append( - VppSocketFilename( - self, - 3, - b"sock/memif3.sock", - add_default_folder=True)) + VppSocketFilename(self, 3, "sock/memif3.sock", add_default_folder=True) + ) - memif = VppMemif(self, MEMIF_ROLE.SLAVE, MEMIF_MODE.ETHERNET) + 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 = MEMIF_ROLE.SLAVE + memif.role = VppEnum.vl_api_memif_role_t.MEMIF_ROLE_API_SLAVE self._create_delete_test_one_interface(memif) - memif.role = MEMIF_ROLE.MASTER + 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, MEMIF_ROLE.SLAVE, MEMIF_MODE.ETHERNET, - ring_size=1024, buffer_size=2048) - - remote_socket = VppSocketFilename(self.remote_test, 1, - b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8')) + """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, MEMIF_ROLE.MASTER, - MEMIF_MODE.ETHERNET, socket_id=1, - ring_size=1024, buffer_size=2048) + 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 = MEMIF_ROLE.MASTER - remote_memif.role = MEMIF_ROLE.SLAVE + 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=memif.ip4_addr) / - ICMP(id=memif.if_id, type='echo-request', seq=i)) + 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, memif.ip4_addr) + 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] @@ -224,16 +246,25 @@ class TestMemif(VppTestCase): self.assertEqual(icmp.seq, seq) def test_memif_ping(self): - """ Memif ping """ - memif = VppMemif(self, MEMIF_ROLE.SLAVE, MEMIF_MODE.ETHERNET) + """Memif ping""" - remote_socket = VppSocketFilename(self.remote_test, 1, - b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8')) + 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, MEMIF_ROLE.MASTER, - MEMIF_MODE.ETHERNET, socket_id=1) + 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() @@ -247,12 +278,15 @@ class TestMemif(VppTestCase): self.assertTrue(remote_memif.wait_for_link_up(5)) # add routing to remote vpp - dst_addr = socket.inet_pton(socket.AF_INET, self.pg0._local_ip4_subnet) - dst_addr_len = 24 - next_hop_addr = socket.inet_pton(socket.AF_INET, memif.ip4_addr) - self.remote_test.vapi.ip_add_del_route(dst_address=dst_addr, - dst_address_length=dst_addr_len, - next_hop_address=next_hop_addr) + 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 @@ -267,6 +301,51 @@ class TestMemif(VppTestCase): self._verify_icmp(self.pg0, remote_memif, c, seq) seq += 1 + route.remove_vpp_config() + + def test_memif_admin_up_down_up(self): + """Memif admin up/down/up""" + 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", + ) + + memif.add_vpp_config() + remote_memif.add_vpp_config() + + memif.admin_up() + remote_memif.admin_up() + memif.admin_down() + remote_memif.admin_down() + memif.admin_up() + remote_memif.admin_up() + + self._connect_test_one_interface(memif) + self._connect_test_one_interface(remote_memif) + + memif.remove_vpp_config() + remote_memif.remove_vpp_config() + remote_socket.remove_vpp_config() + -if __name__ == '__main__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner)