X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip_mcast.py;h=9c216d5657d0ae4a3154df27623dfa5e020c8337;hb=decda5b466843b3164ba13f248f9e0bb93111782;hp=f3d23a612dba5e483c2e8ebc3b31861d8e006063;hpb=cf3561bde53173a7be9aa02ed4897c7f2d55bd0a;p=vpp.git

diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index f3d23a612db..9c216d5657d 100644
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -3,15 +3,13 @@
 import unittest
 
 from framework import VppTestCase, VppTestRunner
-from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
 from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal, \
     MRouteItfFlags, MRouteEntryFlags, VppIpTable, DpoProto
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
-from scapy.layers.inet import IP, UDP, getmacbyip, ICMP
+from scapy.layers.inet import IP, UDP, getmacbyip
 from scapy.layers.inet6 import IPv6, getmacbyip6
-from util import ppp
 
 #
 # The number of packets sent is set to 91 so that when we replicate more than 3
@@ -111,7 +109,7 @@ class TestIPMcast(VppTestCase):
                     capture.remove(p)
         return capture
 
-    def verify_capture_ip4(self, rx_if, sent):
+    def verify_capture_ip4(self, rx_if, sent, dst_mac=None):
         rxd = rx_if.get_capture(len(sent))
 
         try:
@@ -129,8 +127,11 @@ class TestIPMcast(VppTestCase):
                 tx_ip = tx[IP]
                 rx_ip = rx[IP]
 
+                if dst_mac is None:
+                    dst_mac = getmacbyip(rx_ip.dst)
+
                 # check the MAC address on the RX'd packet is correctly formed
-                self.assertEqual(eth.dst, getmacbyip(rx_ip.dst))
+                self.assertEqual(eth.dst, dst_mac)
 
                 self.assertEqual(rx_ip.src, tx_ip.src)
                 self.assertEqual(rx_ip.dst, tx_ip.dst)
@@ -225,6 +226,26 @@ class TestIPMcast(VppTestCase):
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
         route_1_1_1_1_232_1_1_1.add_vpp_config()
 
+        #
+        # An (S,G).
+        # one accepting interface, pg0, 2 forwarding interfaces
+        # that use unicast next-hops
+        #
+        route_1_1_1_1_232_1_1_2 = VppIpMRoute(
+            self,
+            "1.1.1.1",
+            "232.1.1.2", 64,
+            MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
+            [VppMRoutePath(self.pg0.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
+             VppMRoutePath(self.pg1.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
+                           nh=self.pg1.remote_ip4),
+             VppMRoutePath(self.pg2.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
+                           nh=self.pg2.remote_ip4)])
+        route_1_1_1_1_232_1_1_2.add_vpp_config()
+
         #
         # An (*,G/m).
         # one accepting interface, pg0, 1 forwarding interfaces
@@ -283,6 +304,26 @@ class TestIPMcast(VppTestCase):
         self.pg3.assert_nothing_captured(
             remark="IP multicast packets forwarded on PG3")
 
+        #
+        # a stream to the unicast next-hops
+        #
+        self.vapi.cli("clear trace")
+        tx = self.create_stream_ip4(self.pg0, "1.1.1.1", "232.1.1.2")
+        self.pg0.add_stream(tx)
+
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+
+        # We expect replications on Pg1->7
+        self.verify_capture_ip4(self.pg1, tx, dst_mac=self.pg1.remote_mac)
+        self.verify_capture_ip4(self.pg2, tx, dst_mac=self.pg2.remote_mac)
+
+        # no replications on Pg0 nor pg3
+        self.pg0.assert_nothing_captured(
+            remark="IP multicast packets forwarded on PG0")
+        self.pg3.assert_nothing_captured(
+            remark="IP multicast packets forwarded on PG3")
+
         #
         # a stream that matches the route for (*,232.0.0.0/8)
         # Send packets with the 9th bit set so we test the correct clearing
@@ -316,7 +357,7 @@ class TestIPMcast(VppTestCase):
         self.pg_enable_capture(self.pg_interfaces)
         self.pg_start()
 
-        # We expect replications on Pg1, 2, 3.
+        # 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)
@@ -325,6 +366,10 @@ class TestIPMcast(VppTestCase):
         self.verify_capture_ip4(self.pg6, tx)
         self.verify_capture_ip4(self.pg7, tx)
 
+        # no replications on Pg0
+        self.pg0.assert_nothing_captured(
+            remark="IP multicast packets forwarded on PG0")
+
     def test_ip6_mcast(self):
         """ IPv6 Multicast Replication """
 
@@ -406,6 +451,15 @@ class TestIPMcast(VppTestCase):
 
         #
         # a stream that matches the route for (*, ff01::/16)
+        # sent on the non-accepting interface
+        #
+        self.vapi.cli("clear trace")
+        tx = self.create_stream_ip6(self.pg1, "2002::1", "ff01:2::255")
+        self.send_and_assert_no_replies(self.pg1, tx, "RPF miss")
+
+        #
+        # a stream that matches the route for (*, ff01::/16)
+        # sent on the accepting interface
         #
         self.vapi.cli("clear trace")
         tx = self.create_stream_ip6(self.pg0, "2002::1", "ff01:2::255")