acl-plugin: fix the l2l3 unittest to actually verify the pcap 86/18286/2
authorAndrew Yourtchenko <ayourtch@gmail.com>
Thu, 14 Mar 2019 11:54:36 +0000 (12:54 +0100)
committerPaul Vinciguerra <pvinci@vinciconsulting.com>
Thu, 14 Mar 2019 15:15:49 +0000 (15:15 +0000)
Thanks to Paul Vinciguerra for spotting it.

Change-Id: I1f776c3c21865dbc52c4d659c62cbfa4967e15e9
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
test/test_acl_plugin_l2l3.py

index 05c043e..0a17ed4 100644 (file)
@@ -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: