From efd7bc2b1c8db160933ed3e9ab3cde0d07aaf863 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 11 Nov 2019 08:32:34 +0000 Subject: tests: Remove the unrequired VPP IP address/prefix class wrappers Type: refactor Change-Id: I204f3f8eebc5f5d5a377e91262f91c615fd00168 Signed-off-by: Neale Ranns --- src/plugins/memif/test/test_memif.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/plugins/memif/test/test_memif.py') diff --git a/src/plugins/memif/test/test_memif.py b/src/plugins/memif/test/test_memif.py index a999b17678f..f11dd89f975 100644 --- a/src/plugins/memif/test/test_memif.py +++ b/src/plugins/memif/test/test_memif.py @@ -221,14 +221,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.ip_prefix.address) / + 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.ip_prefix.address) + 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] @@ -267,7 +268,8 @@ class TestMemif(VppTestCase): # add routing to remote vpp route = VppIpRoute(self.remote_test, self.pg0._local_ip4_subnet, 24, - [VppRoutePath(memif.ip_prefix.address, 0xffffffff)], + [VppRoutePath(memif.ip_prefix.network_address, + 0xffffffff)], register=False) route.add_vpp_config() -- cgit 1.2.3-korg