X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_memif.py;h=fc7cf9b2e7e28a45004ffa0ddd5b87f70d300f4d;hb=dec79ecf39c95054f3c7fbbf6019a032410a0231;hp=d89e06bfb4be10a374e7f5abc4cba1497576d9cd;hpb=3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934;p=vpp.git diff --git a/test/test_memif.py b/test/test_memif.py index d89e06bfb4b..fc7cf9b2e7e 100644 --- a/test/test_memif.py +++ b/test/test_memif.py @@ -3,21 +3,37 @@ 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 framework import tag_run_solo from remote_test import RemoteClass, RemoteVppTestCase -from vpp_memif import MEMIF_MODE, MEMIF_ROLE, remove_all_memif_vpp_config, \ +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(RemoteVppTestCase) + cls.remote_test = RemoteClass(cls.remote_class) cls.remote_test.start_remote() cls.remote_test.set_request_timeout(10) super(TestMemif, cls).setUpClass() @@ -46,39 +62,37 @@ 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): + 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'))) + 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'))) + self, 1, "%s/memif1.sock" % self.tempdir)) # default path (test tempdir) memif_sockets.append( VppSocketFilename( self, 2, - b"memif2.sock", + "memif2.sock", add_default_folder=True)) # create new folder in default folder memif_sockets.append( VppSocketFilename( self, 3, - b"sock/memif3.sock", + "sock/memif3.sock", add_default_folder=True)) for sock in memif_sockets: @@ -96,8 +110,7 @@ class TestMemif(VppTestCase): 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'))) + dump, 0, "%s/memif.sock" % self.tempdir)) def _create_delete_test_one_interface(self, memif): memif.add_vpp_config() @@ -121,7 +134,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: @@ -144,9 +157,12 @@ class TestMemif(VppTestCase): def test_memif_create_delete(self): """ 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): @@ -156,51 +172,62 @@ class TestMemif(VppTestCase): # existing path memif_sockets.append( VppSocketFilename( - self, 1, b"%s/memif1.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8'))) + self, 1, "%s/memif1.sock" % self.tempdir)) # default path (test tempdir) memif_sockets.append( VppSocketFilename( self, 2, - b"memif2.sock", + "memif2.sock", add_default_folder=True)) # create new folder in default folder memif_sockets.append( VppSocketFilename( self, 3, - b"sock/memif3.sock", + "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) + 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, - b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8')) + "%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) @@ -208,14 +235,15 @@ class TestMemif(VppTestCase): 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) / + 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] @@ -225,15 +253,21 @@ class TestMemif(VppTestCase): def test_memif_ping(self): """ Memif ping """ - 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) remote_socket = VppSocketFilename(self.remote_test, 1, - b"%s/memif.sock" % six.ensure_binary( - self.tempdir, encoding='utf-8')) + "%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 +281,12 @@ 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,8 @@ class TestMemif(VppTestCase): self._verify_icmp(self.pg0, remote_memif, c, seq) seq += 1 + route.remove_vpp_config() + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner)