From e5468b320a1f85c58cd888f8ac930b29f85c2e4b Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Thu, 14 Mar 2019 12:54:36 +0100 Subject: acl-plugin: fix the l2l3 unittest to actually verify the pcap Thanks to Paul Vinciguerra for spotting it. Change-Id: I1f776c3c21865dbc52c4d659c62cbfa4967e15e9 Signed-off-by: Andrew Yourtchenko --- test/test_acl_plugin_l2l3.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/test_acl_plugin_l2l3.py b/test/test_acl_plugin_l2l3.py index 05c043e859e..0a17ed4b5ff 100644 --- a/test/test_acl_plugin_l2l3.py +++ b/test/test_acl_plugin_l2l3.py @@ -293,7 +293,6 @@ class TestACLpluginL2L3(VppTestCase): last_info[i.sw_if_index] = None dst_ip_sw_if_index = dst_ip_if.sw_if_index - return for packet in capture: l3 = IP if packet.haslayer(IP) else IPv6 @@ -318,7 +317,9 @@ class TestACLpluginL2L3(VppTestCase): data = scapy.compat.raw(ICMPv6Unknown( scapy.compat.raw(packet[l3].payload)).msgbody) udp_or_icmp = packet[l3].payload - payload_info = self.payload_to_info(data) + data_obj = Raw(data) + # FIXME: make framework believe we are on object + payload_info = self.payload_to_info(data_obj) packet_index = payload_info.index self.assertEqual(payload_info.dst, dst_ip_sw_if_index) @@ -345,8 +346,6 @@ class TestACLpluginL2L3(VppTestCase): if l4 == UDP: self.assertEqual(udp_or_icmp.sport, saved_packet[l4].sport) self.assertEqual(udp_or_icmp.dport, saved_packet[l4].dport) - else: - print("Saved packet is none") # self.assertEqual(ip.dst, host.ip4) # UDP: -- cgit 1.2.3-korg