vxlan: vxlan/vxlan.api API cleanup

[vpp.git] / test / test_ip_mcast.py

diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index 41c6f3b..d7a8238 100644 (file)
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -1,14 +1,15 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
 from framework import VppTestCase, VppTestRunner
 from vpp_ip import DpoProto
 from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal, \
-    MRouteItfFlags, MRouteEntryFlags, VppIpTable
+    MRouteItfFlags, MRouteEntryFlags, VppIpTable, FibPathProto
+from vpp_gre_interface import VppGreInterface
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether
+from scapy.layers.l2 import Ether, GRE
 from scapy.layers.inet import IP, UDP, getmacbyip
 from scapy.layers.inet6 import IPv6, getmacbyip6
 
@@ -25,6 +26,14 @@ N_PKTS_IN_STREAM = 91
 class TestMFIB(VppTestCase):
     """ MFIB Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestMFIB, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestMFIB, cls).tearDownClass()
+
     def setUp(self):
         super(TestMFIB, self).setUp()
 
@@ -40,6 +49,14 @@ class TestMFIB(VppTestCase):
 class TestIPMcast(VppTestCase):
     """ IP Multicast Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPMcast, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPMcast, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPMcast, self).setUp()
 
@@ -83,7 +100,7 @@ class TestIPMcast(VppTestCase):
              UDP(sport=1234, dport=1234))
         if not payload_size:
             payload_size = 64 - len(p)
-            p = p / Raw('\xa5' * payload_size)
+            p = p / Raw(b'\xa5' * payload_size)
 
         for i in range(0, N_PKTS_IN_STREAM):
             pkts.append(p)
@@ -104,7 +121,7 @@ class TestIPMcast(VppTestCase):
 
     def verify_filter(self, capture, sent):
         if not len(capture) == len(sent):
-            # filter out any IPv6 RAs from the captur
+            # filter out any IPv6 RAs from the capture
             for p in capture:
                 if (p.haslayer(IPv6)):
                     capture.remove(p)
@@ -184,7 +201,7 @@ class TestIPMcast(VppTestCase):
         #
         # A (*,G).
         # one accepting interface, pg0, 7 forwarding interfaces
-        #  many forwarding interfaces test the case where the replicare DPO
+        #  many forwarding interfaces test the case where the replicate DPO
         #  needs to use extra cache lines for the buckets.
         #
         route_232_1_1_1 = VppIpMRoute(
@@ -405,17 +422,16 @@ class TestIPMcast(VppTestCase):
             MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
             [VppMRoutePath(self.pg0.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg1.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg2.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg3.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6)],
-            is_ip6=1)
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)])
         route_ff01_1.add_vpp_config()
 
         #
@@ -429,14 +445,13 @@ class TestIPMcast(VppTestCase):
             MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
             [VppMRoutePath(self.pg0.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg1.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg2.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6)],
-            is_ip6=1)
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)])
         route_2001_ff01_1.add_vpp_config()
 
         #
@@ -450,11 +465,10 @@ class TestIPMcast(VppTestCase):
             MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
             [VppMRoutePath(self.pg0.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg1.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6)],
-            is_ip6=1)
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)])
         route_ff01.add_vpp_config()
 
         #
@@ -671,6 +685,7 @@ class TestIPMcast(VppTestCase):
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
 
         route_232_1_1_1.add_vpp_config()
+
         route_232_1_1_1.update_entry_flags(
             MRouteEntryFlags.MFIB_ENTRY_FLAG_SIGNAL)
 
@@ -781,6 +796,79 @@ class TestIPMcast(VppTestCase):
         self.verify_capture_ip4(self.pg1, tx)
         self.verify_capture_ip4(self.pg2, tx)
 
+    def test_ip_mcast_gre(self):
+        """ IP Multicast Replication over GRE"""
+
+        gre_if_1 = VppGreInterface(
+            self,
+            self.pg1.local_ip4,
+            self.pg1.remote_ip4).add_vpp_config()
+        gre_if_2 = VppGreInterface(
+            self,
+            self.pg2.local_ip4,
+            self.pg2.remote_ip4).add_vpp_config()
+        gre_if_3 = VppGreInterface(
+            self,
+            self.pg3.local_ip4,
+            self.pg3.remote_ip4).add_vpp_config()
+
+        gre_if_1.admin_up()
+        gre_if_1.config_ip4()
+        gre_if_2.admin_up()
+        gre_if_2.config_ip4()
+        gre_if_3.admin_up()
+        gre_if_3.config_ip4()
+
+        #
+        # An (S,G).
+        # one accepting interface, pg0, 2 forwarding interfaces
+        #
+        route_1_1_1_1_232_1_1_1 = VppIpMRoute(
+            self,
+            "1.1.1.1",
+            "232.2.2.2", 64,
+            MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
+            [VppMRoutePath(gre_if_1.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
+             VppMRoutePath(gre_if_2.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD),
+             VppMRoutePath(gre_if_3.sw_if_index,
+                           MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
+        route_1_1_1_1_232_1_1_1.add_vpp_config()
+
+        #
+        # a stream that matches the route for (1.1.1.1,232.2.2.2)
+        #  small packets
+        #
+        tx = (Ether(dst=self.pg1.local_mac,
+                    src=self.pg1.remote_mac) /
+              IP(src=self.pg1.remote_ip4,
+                 dst=self.pg1.local_ip4) /
+              GRE() /
+              IP(src="1.1.1.1", dst="232.2.2.2") /
+              UDP(sport=1234, dport=1234) /
+              Raw(b'\a5' * 64)) * 63
+
+        self.vapi.cli("clear trace")
+        self.pg1.add_stream(tx)
+
+        self.pg_enable_capture(self.pg_interfaces)
+        self.pg_start()
+
+        # We expect replications on Pg2 & 3
+        # check the encap headers are as expected based on the egress tunnel
+        rxs = self.pg2.get_capture(len(tx))
+        for rx in rxs:
+            self.assertEqual(rx[IP].src, gre_if_2.t_src)
+            self.assertEqual(rx[IP].dst, gre_if_2.t_dst)
+            self.assert_packet_checksums_valid(rx)
+
+        rxs = self.pg3.get_capture(len(tx))
+        for rx in rxs:
+            self.assertEqual(rx[IP].src, gre_if_3.t_src)
+            self.assertEqual(rx[IP].dst, gre_if_3.t_dst)
+            self.assert_packet_checksums_valid(rx)
+
     def test_ip6_mcast_vrf(self):
         """ IPv6 Multicast Replication in non-default table"""
 
@@ -795,15 +883,14 @@ class TestIPMcast(VppTestCase):
             MRouteEntryFlags.MFIB_ENTRY_FLAG_NONE,
             [VppMRoutePath(self.pg8.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg1.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6),
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6),
              VppMRoutePath(self.pg2.sw_if_index,
                            MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
-                           proto=DpoProto.DPO_PROTO_IP6)],
-            table_id=10,
-            is_ip6=1)
+                           proto=FibPathProto.FIB_PATH_NH_PROTO_IP6)],
+            table_id=10)
         route_2001_ff01_1.add_vpp_config()
 
         #