From 3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 Mon Sep 17 00:00:00 2001 From: Ole Trøan Date: Fri, 15 Mar 2019 16:14:41 +0000 Subject: Revert "API: Cleanup APIs interface.api" This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd. Allow time for CSIT to accommodate. Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2 Signed-off-by: ot@cisco.com --- test/test_memif.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'test/test_memif.py') diff --git a/test/test_memif.py b/test/test_memif.py index e5ff18186c1..d89e06bfb4b 100644 --- a/test/test_memif.py +++ b/test/test_memif.py @@ -208,14 +208,14 @@ 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=memif.ip4_addr) / 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, memif.ip4_addr) self.assertEqual(ip.dst, pg.remote_ip4) self.assertEqual(ip.proto, 1) icmp = rx[ICMP] @@ -249,11 +249,10 @@ class TestMemif(VppTestCase): # 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.ip_prefix.address) - self.remote_test.vapi.ip_add_del_route( - dst_address=dst_addr, dst_address_length=dst_addr_len, - next_hop_address=next_hop_addr) + 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) # create ICMP echo-request from local pg to remote memif packet_num = 10 -- cgit 1.2.3-korg