Add missing counters for P2P ethernet interfaces

[vpp.git] / test / test_ip_mcast.py

diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index 094942b..276555d 100644 (file)
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -89,8 +89,8 @@ class TestIPMcast(VppTestCase):
                     capture.remove(p)
         return capture
 
-    def verify_capture_ip4(self, src_if, sent):
-        rxd = self.pg1.get_capture(N_PKTS_IN_STREAM)
+    def verify_capture_ip4(self, rx_if, sent):
+        rxd = rx_if.get_capture(len(sent))
 
         try:
             capture = self.verify_filter(rxd, sent)
@@ -101,7 +101,6 @@ class TestIPMcast(VppTestCase):
                 tx = sent[i]
                 rx = capture[i]
 
-                # the rx'd packet has the MPLS label popped
                 eth = rx[Ether]
                 self.assertEqual(eth.type, 0x800)
 
@@ -119,8 +118,8 @@ class TestIPMcast(VppTestCase):
         except:
             raise
 
-    def verify_capture_ip6(self, src_if, sent):
-        capture = self.pg1.get_capture(N_PKTS_IN_STREAM)
+    def verify_capture_ip6(self, rx_if, sent):
+        capture = rx_if.get_capture(len(sent))
 
         self.assertEqual(len(capture), len(sent))
 
@@ -128,7 +127,6 @@ class TestIPMcast(VppTestCase):
             tx = sent[i]
             rx = capture[i]
 
-            # the rx'd packet has the MPLS label popped
             eth = rx[Ether]
             self.assertEqual(eth.type, 0x86DD)
 
@@ -234,11 +232,6 @@ class TestIPMcast(VppTestCase):
         # We expect replications on Pg1->7
         self.verify_capture_ip4(self.pg1, tx)
         self.verify_capture_ip4(self.pg2, tx)
-        self.verify_capture_ip4(self.pg3, tx)
-        self.verify_capture_ip4(self.pg4, tx)
-        self.verify_capture_ip4(self.pg5, tx)
-        self.verify_capture_ip4(self.pg6, tx)
-        self.verify_capture_ip4(self.pg7, tx)
 
         # no replications on Pg0
         self.pg0.assert_nothing_captured(
@@ -261,11 +254,6 @@ class TestIPMcast(VppTestCase):
         # We expect replications on Pg1->7
         self.verify_capture_ip4(self.pg1, tx)
         self.verify_capture_ip4(self.pg2, tx)
-        self.verify_capture_ip4(self.pg3, tx)
-        self.verify_capture_ip4(self.pg4, tx)
-        self.verify_capture_ip4(self.pg5, tx)
-        self.verify_capture_ip4(self.pg6, tx)
-        self.verify_capture_ip4(self.pg7, tx)
 
         # no replications on Pg0
         self.pg0.assert_nothing_captured(
@@ -310,10 +298,10 @@ class TestIPMcast(VppTestCase):
         self.verify_capture_ip4(self.pg1, tx)
         self.verify_capture_ip4(self.pg2, tx)
         self.verify_capture_ip4(self.pg3, tx)
-
-        # no replications on Pg0
-        self.pg0.assert_nothing_captured(
-            remark="IP multicast packets forwarded on PG0")
+        self.verify_capture_ip4(self.pg4, tx)
+        self.verify_capture_ip4(self.pg5, tx)
+        self.verify_capture_ip4(self.pg6, tx)
+        self.verify_capture_ip4(self.pg7, tx)
 
         route_232_1_1_1.remove_vpp_config()
         route_1_1_1_1_232_1_1_1.remove_vpp_config()
@@ -410,6 +398,22 @@ class TestIPMcast(VppTestCase):
         self.pg3.assert_nothing_captured(
             remark="IP multicast packets forwarded on PG3")
 
+        #
+        # Bounce the interface and it should still work
+        #
+        self.pg1.admin_down()
+        self.pg0.add_stream(tx)
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+        self.pg1.assert_nothing_captured(
+            remark="IP multicast packets forwarded on down PG1")
+
+        self.pg1.admin_up()
+        self.pg0.add_stream(tx)
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+        self.verify_capture_ip6(self.pg1, tx)
+
         #
         # a stream that matches the route for (*,ff01::1)
         #
@@ -624,6 +628,7 @@ class TestIPMcast(VppTestCase):
             (MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT |
              MRouteItfFlags.MFIB_ITF_FLAG_NEGATE_SIGNAL))
 
+        self.vapi.cli("clear trace")
         tx = self._mcast_connected_send_stream("232.1.1.1")
 
         signals = self.vapi.mfib_signal_dump()