X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_memif.py;h=aae5b3c1efbd36dff2ad8c0d29062ffbe423a4a9;hb=fea826077113265cdaf0a341fb9aac330705c8b8;hp=d89e06bfb4be10a374e7f5abc4cba1497576d9cd;hpb=a5b2eec0535f9025319a752891d77ff9948ae0df;p=vpp.git diff --git a/test/test_memif.py b/test/test_memif.py index d89e06bfb4b..aae5b3c1efb 100644 --- a/test/test_memif.py +++ b/test/test_memif.py @@ -9,6 +9,7 @@ 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 vpp_ip_route import VppIpRoute, VppRoutePath class TestMemif(VppTestCase): @@ -51,7 +52,7 @@ class TestMemif(VppTestCase): 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() @@ -225,6 +226,7 @@ class TestMemif(VppTestCase): def test_memif_ping(self): """ Memif ping """ + memif = VppMemif(self, MEMIF_ROLE.SLAVE, MEMIF_MODE.ETHERNET) remote_socket = VppSocketFilename(self.remote_test, 1, @@ -247,12 +249,11 @@ 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.ip4_addr, 0xffffffff)], + register=False) + + route.add_vpp_config() # create ICMP echo-request from local pg to remote memif packet_num = 10 @@ -267,6 +268,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)