X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_l2_fib.py;h=3d5d21292e9c047b579a0b5bb6e59b8ef00b6c3a;hb=227038a444b98f922b4a4f44b85ae60f9ee86e1c;hp=eb4f4e32d1bcb3a70e900248385917d95096fdbe;hpb=4af521d2972af7efcf8ed0678293d2f0e2ce1b45;p=vpp.git

diff --git a/test/test_l2_fib.py b/test/test_l2_fib.py
index eb4f4e32d1b..3d5d21292e9 100644
--- a/test/test_l2_fib.py
+++ b/test/test_l2_fib.py
@@ -68,7 +68,7 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 
 from framework import VppTestCase, VppTestRunner
-from util import Host
+from util import Host, ppp
 
 
 class TestL2fib(VppTestCase):
@@ -106,7 +106,8 @@ class TestL2fib(VppTestCase):
 
             # Create BD with MAC learning and unknown unicast flooding disabled
             # and put interfaces to this BD
-            cls.vapi.bridge_domain_add_del(bd_id=cls.bd_id, uu_flood=0, learn=0)
+            cls.vapi.bridge_domain_add_del(
+                bd_id=cls.bd_id, uu_flood=0, learn=0)
             for pg_if in cls.pg_interfaces:
                 cls.vapi.sw_interface_set_l2_bridge(pg_if.sw_if_index,
                                                     bd_id=cls.bd_id)
@@ -130,11 +131,8 @@ class TestL2fib(VppTestCase):
             raise
 
     def setUp(self):
-        """
-        Clear trace and packet infos before running each test.
-        """
         super(TestL2fib, self).setUp()
-        self.packet_infos = {}
+        self.reset_packet_infos()
 
     def tearDown(self):
         """
@@ -183,8 +181,8 @@ class TestL2fib(VppTestCase):
             end_nr = start + count / n_int
             for j in range(start, end_nr):
                 host = self.hosts_by_pg_idx[pg_if.sw_if_index][j]
-                self.vapi.l2fib_add_del(host.mac, self.bd_id, pg_if.sw_if_index,
-                                        static_mac=1)
+                self.vapi.l2fib_add_del(
+                    host.mac, self.bd_id, pg_if.sw_if_index, static_mac=1)
                 counter += 1
                 percentage = counter / count * 100
                 if percentage > percent:
@@ -205,8 +203,8 @@ class TestL2fib(VppTestCase):
         for pg_if in self.pg_interfaces:
             for j in range(count / n_int):
                 host = self.hosts_by_pg_idx[pg_if.sw_if_index][0]
-                self.vapi.l2fib_add_del(host.mac, self.bd_id, pg_if.sw_if_index,
-                                        is_add=0)
+                self.vapi.l2fib_add_del(
+                    host.mac, self.bd_id, pg_if.sw_if_index, is_add=0)
                 self.deleted_hosts_by_pg_idx[pg_if.sw_if_index].append(host)
                 del self.hosts_by_pg_idx[pg_if.sw_if_index][0]
                 counter += 1
@@ -236,8 +234,7 @@ class TestL2fib(VppTestCase):
             for i in range(0, n_int):
                 dst_host = dst_hosts[i]
                 src_host = random.choice(src_hosts)
-                pkt_info = self.create_packet_info(
-                    src_if.sw_if_index, dst_if.sw_if_index)
+                pkt_info = self.create_packet_info(src_if, dst_if)
                 payload = self.info_to_payload(pkt_info)
                 p = (Ether(dst=dst_host.mac, src=src_host.mac) /
                      IP(src=src_host.ip4, dst=dst_host.ip4) /
@@ -282,8 +279,7 @@ class TestL2fib(VppTestCase):
                 self.assertEqual(udp.sport, saved_packet[UDP].sport)
                 self.assertEqual(udp.dport, saved_packet[UDP].dport)
             except:
-                self.logger.error("Unexpected or invalid packet:")
-                self.logger.error(packet.show())
+                self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise
         for i in self.pg_interfaces:
             remaining_packet = self.get_next_packet_info_for_interface2(
@@ -315,7 +311,7 @@ class TestL2fib(VppTestCase):
         # Test
         # Create incoming packet streams for packet-generator interfaces for
         # deleted MAC addresses
-        self.packet_infos = {}
+        self.reset_packet_infos()
         for i in self.pg_interfaces:
             pkts = self.create_stream(i, self.pg_if_packet_sizes, deleted=True)
             i.add_stream(pkts)
@@ -327,14 +323,7 @@ class TestL2fib(VppTestCase):
         # Verify
         # Verify outgoing packet streams per packet-generator interface
         for i in self.pg_interfaces:
-            capture = i.get_capture()
-            self.logger.info("Verifying capture on interface %s" % i.name)
-            try:
-                self.assertEqual(len(capture), 0)
-            except AssertionError:
-                self.logger.error("The capture on interface %s is not empty!"
-                                  % i.name)
-                raise AssertionError("%d != 0" % len(capture))
+            i.assert_nothing_captured(remark="outgoing interface")
 
     def test_l2_fib_01(self):
         """ L2 FIB test 1 - program 100 MAC addresses