Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
IPIP and SIXRD tunnels create API needs table-IDs not fib-indexes
[vpp.git] / test / test_sixrd.py
diff --git a/test/test_sixrd.py b/test/test_sixrd.py
index c6b3c08..7656c3f 100644 (file)
--- a/test/test_sixrd.py
+++ b/test/test_sixrd.py
@@ -6,7 +6,7 @@ from scapy.layers.inet import IP, UDP, Ether
 from scapy.layers.inet6 import IPv6
 from scapy.packet import Raw
 from framework import VppTestCase, VppTestRunner
 from scapy.layers.inet6 import IPv6
 from scapy.packet import Raw
 from framework import VppTestCase, VppTestRunner
-from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto
+from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto, VppIpTable
 from socket import AF_INET, AF_INET6, inet_pton
 
 """ Test6rd is a subclass of  VPPTestCase classes.
 from socket import AF_INET, AF_INET6, inet_pton
 
 """ Test6rd is a subclass of  VPPTestCase classes.
@@ -22,13 +22,23 @@ class Test6RD(VppTestCase):
     @classmethod
     def setUpClass(cls):
         super(Test6RD, cls).setUpClass()
     @classmethod
     def setUpClass(cls):
         super(Test6RD, cls).setUpClass()
-        cls.create_pg_interfaces(range(2))
+        cls.create_pg_interfaces(range(4))
         cls.interfaces = list(cls.pg_interfaces)
 
         cls.interfaces = list(cls.pg_interfaces)
 
-    def setUp(cls):
-        super(Test6RD, cls).setUp()
-        for i in cls.interfaces:
+    def setUp(self):
+        super(Test6RD, self).setUp()
+        t4 = VppIpTable(self, 10)
+        t6 = VppIpTable(self, 20, True)
+
+        t4.add_vpp_config()
+        t6.add_vpp_config()
+
+        for n in range(4):
+            i = self.pg_interfaces[n]
             i.admin_up()
             i.admin_up()
+            if (n > 1):
+                i.set_table_ip4(10)
+                i.set_table_ip6(20)
             i.config_ip4()
             i.config_ip6()
             i.disable_ipv6_ra()
             i.config_ip4()
             i.config_ip6()
             i.disable_ipv6_ra()
@@ -36,17 +46,12 @@ class Test6RD(VppTestCase):
             i.resolve_ndp()
 
     def tearDown(self):
             i.resolve_ndp()
 
     def tearDown(self):
+        for i in self.pg_interfaces:
+            i.unconfig_ip4()
+            i.unconfig_ip6()
+            i.set_table_ip4(0)
+            i.set_table_ip6(0)
         super(Test6RD, self).tearDown()
         super(Test6RD, self).tearDown()
-        if not self.vpp_dead:
-            for i in self.pg_interfaces:
-                i.unconfig_ip4()
-                i.unconfig_ip6()
-                i.admin_down()
-            if type(self.tunnel_index) is list:
-                for sw_if_index in self.tunnel_index:
-                    self.vapi.ipip_6rd_del_tunnel(sw_if_index)
-            else:
-                self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
     def validate_6in4(self, rx, expected):
         if IP not in rx:
 
     def validate_6in4(self, rx, expected):
         if IP not in rx:
@@ -80,7 +85,7 @@ class Test6RD(VppTestCase):
 
         rv = self.vapi.ipip_6rd_add_tunnel(
             0, inet_pton(AF_INET6, '2002::'), 16,
 
         rv = self.vapi.ipip_6rd_add_tunnel(
             0, inet_pton(AF_INET6, '2002::'), 16,
-            inet_pton(AF_INET, '0.0.0.0'), 0,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
             self.pg0.local_ip4n, True)
         self.tunnel_index = rv.sw_if_index
 
             self.pg0.local_ip4n, True)
         self.tunnel_index = rv.sw_if_index
 
@@ -105,20 +110,55 @@ class Test6RD(VppTestCase):
                       proto='ipv6') / p_ip6)
 
         rx = self.send_and_assert_no_replies(self.pg0, p*10)
                       proto='ipv6') / p_ip6)
 
         rx = self.send_and_assert_no_replies(self.pg0, p*10)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
+
+    def test_6rd_ip6_to_ip4_vrf(self):
+        """ ip6 -> ip4 (encap) 6rd VRF test """
+        p_ether = Ether(src=self.pg2.remote_mac, dst=self.pg2.local_mac)
+        p_ip6 = IPv6(src="1::1", dst="2002:AC10:0402::1", nh='UDP')
+
+        rv = self.vapi.ipip_6rd_add_tunnel(
+            20, inet_pton(AF_INET6, '2002::'), 16,
+            10, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg2.local_ip4n, True)
+        self.tunnel_index = rv.sw_if_index
+
+        self.vapi.cli("show ip6 fib")
+        p_payload = UDP(sport=1234, dport=1234)
+        p = (p_ether / p_ip6 / p_payload)
+
+        p_reply = (IP(src=self.pg2.local_ip4, dst=self.pg3.remote_ip4,
+                      proto='ipv6') / p_ip6)
+
+        rx = self.send_and_expect(self.pg2, p*10, self.pg3)
+        for p in rx:
+            self.validate_6in4(p, p_reply)
+
+        # MTU tests (default is 1480)
+        plen = 1481 - 40 - 8
+        p_ip6 = IPv6(src="1::1", dst="2002:AC10:0402::1")
+        p_payload = UDP(sport=1234, dport=1234) / Raw(self.payload(plen))
+        p = (p_ether / p_ip6 / p_payload)
+
+        p_reply = (IP(src=self.pg2.local_ip4, dst=self.pg3.remote_ip4,
+                      proto='ipv6') / p_ip6)
+
+        rx = self.send_and_assert_no_replies(self.pg0, p*10)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
     def test_6rd_ip4_to_ip6(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
 
     def test_6rd_ip4_to_ip6(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2002::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg0.local_ip4n, True)
+            0, inet_pton(AF_INET6, '2002::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg0.local_ip4n, True)
         self.tunnel_index = rv.sw_if_index
         rv = self.vapi.ipip_6rd_del_tunnel(rv.sw_if_index)
         rv = self.vapi.ipip_6rd_add_tunnel(
         self.tunnel_index = rv.sw_if_index
         rv = self.vapi.ipip_6rd_del_tunnel(rv.sw_if_index)
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2002::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg0.local_ip4n, True)
+            0, inet_pton(AF_INET6, '2002::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg0.local_ip4n, True)
         self.tunnel_index = rv.sw_if_index
 
         p_ip6 = (IPv6(src="2002:AC10:0202::1", dst=self.pg1.remote_ip6) /
         self.tunnel_index = rv.sw_if_index
 
         p_ip6 = (IPv6(src="2002:AC10:0202::1", dst=self.pg1.remote_ip6) /
@@ -134,21 +174,54 @@ class Test6RD(VppTestCase):
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_reply)
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_reply)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
+
+    def test_6rd_ip4_to_ip6_vrf(self):
+        """ ip4 -> ip6 (decap) 6rd VRF test """
+
+        rv = self.vapi.ipip_6rd_add_tunnel(
+            20, inet_pton(AF_INET6, '2002::'), 16,
+            10, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg2.local_ip4n, True)
+        self.tunnel_index = rv.sw_if_index
+        rv = self.vapi.ipip_6rd_del_tunnel(rv.sw_if_index)
+        rv = self.vapi.ipip_6rd_add_tunnel(
+            20, inet_pton(AF_INET6, '2002::'), 16,
+            10, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg2.local_ip4n, True)
+        self.tunnel_index = rv.sw_if_index
+        self.vapi.sw_interface_set_table(self.tunnel_index, 1, 20)
+
+        p_ip6 = (IPv6(src="2002:AC10:0402::1", dst=self.pg3.remote_ip6) /
+                 UDP(sport=1234, dport=1234))
+
+        p = (Ether(src=self.pg2.remote_mac,
+                   dst=self.pg2.local_mac) /
+             IP(src=self.pg3.remote_ip4, dst=self.pg2.local_ip4) /
+             p_ip6)
+
+        p_reply = p_ip6
+
+        rx = self.send_and_expect(self.pg2, p*10, self.pg3)
+        for p in rx:
+            self.validate_4in6(p, p_reply)
+        self.vapi.sw_interface_set_table(self.tunnel_index, 1, 0)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
     def test_6rd_ip4_to_ip6_multiple(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         self.tunnel_index = []
         rv = self.vapi.ipip_6rd_add_tunnel(
 
     def test_6rd_ip4_to_ip6_multiple(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         self.tunnel_index = []
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2002::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg0.local_ip4n, True)
+            0, inet_pton(AF_INET6, '2002::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg0.local_ip4n, True)
         self.tunnel_index.append(rv.sw_if_index)
 
         rv = self.vapi.ipip_6rd_add_tunnel(
         self.tunnel_index.append(rv.sw_if_index)
 
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2003::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg1.local_ip4n, True)
+            0, inet_pton(AF_INET6, '2003::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg1.local_ip4n, True)
         self.tunnel_index.append(rv.sw_if_index)
 
         self.vapi.cli("show ip6 fib")
         self.tunnel_index.append(rv.sw_if_index)
 
         self.vapi.cli("show ip6 fib")
@@ -168,13 +241,15 @@ class Test6RD(VppTestCase):
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_ip6_2)
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_ip6_2)
+        for i in self.tunnel_index:
+            self.vapi.ipip_6rd_del_tunnel(i)
 
     def test_6rd_ip4_to_ip6_suffix(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
             0, inet_pton(AF_INET6, '2002::'), 16,
 
     def test_6rd_ip4_to_ip6_suffix(self):
         """ ip4 -> ip6 (decap) 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
             0, inet_pton(AF_INET6, '2002::'), 16,
-            inet_pton(AF_INET, '172.0.0.0'), 8,
+            0, inet_pton(AF_INET, '172.0.0.0'), 8,
             self.pg0.local_ip4n, True)
 
         self.tunnel_index = rv.sw_if_index
             self.pg0.local_ip4n, True)
 
         self.tunnel_index = rv.sw_if_index
@@ -189,14 +264,15 @@ class Test6RD(VppTestCase):
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_ip6)
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_ip6)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
     def test_6rd_ip4_to_ip6_sec_check(self):
         """ ip4 -> ip6 (decap) security check 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
 
     def test_6rd_ip4_to_ip6_sec_check(self):
         """ ip4 -> ip6 (decap) security check 6rd test """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2002::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg0.local_ip4n, True)
+            0, inet_pton(AF_INET6, '2002::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg0.local_ip4n, True)
         self.tunnel_index = rv.sw_if_index
 
         self.vapi.cli("show ip6 fib")
         self.tunnel_index = rv.sw_if_index
 
         self.vapi.cli("show ip6 fib")
@@ -221,14 +297,15 @@ class Test6RD(VppTestCase):
              IP(src=self.pg1.remote_ip4, dst=self.pg0.local_ip4) /
              p_ip6_fail)
         rx = self.send_and_assert_no_replies(self.pg0, p*10)
              IP(src=self.pg1.remote_ip4, dst=self.pg0.local_ip4) /
              p_ip6_fail)
         rx = self.send_and_assert_no_replies(self.pg0, p*10)
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
     def test_6rd_bgp_tunnel(self):
         """ 6rd BGP tunnel """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
 
     def test_6rd_bgp_tunnel(self):
         """ 6rd BGP tunnel """
 
         rv = self.vapi.ipip_6rd_add_tunnel(
-            0, inet_pton(AF_INET6, '2002::'),
-            16, inet_pton(AF_INET, '0.0.0.0'),
-            0, self.pg0.local_ip4n, False)
+            0, inet_pton(AF_INET6, '2002::'), 16,
+            0, inet_pton(AF_INET, '0.0.0.0'), 0,
+            self.pg0.local_ip4n, False)
         self.tunnel_index = rv.sw_if_index
 
         default_route = VppIpRoute(
         self.tunnel_index = rv.sw_if_index
 
         default_route = VppIpRoute(
@@ -269,6 +346,9 @@ class Test6RD(VppTestCase):
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_reply)
         rx = self.send_and_expect(self.pg0, p*10, self.pg1)
         for p in rx:
             self.validate_4in6(p, p_reply)
+        ip4_route.remove_vpp_config()
+        default_route.remove_vpp_config()
+        self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':
Vector Packet Processing