X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_sixrd.py;h=24ff74b8d1c72da2deab505ff89fb5e5cabc9297;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=910313d5fa7300a35acc7ceb41ef0450c67c2bbd;hpb=7f9b7f9f492d1748d8ba025b3a713058fdb1943d;p=vpp.git diff --git a/test/test_sixrd.py b/test/test_sixrd.py index 910313d5fa7..24ff74b8d1c 100644 --- a/test/test_sixrd.py +++ b/test/test_sixrd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ 6RD RFC5969 functional tests """ import unittest @@ -7,7 +7,7 @@ from scapy.layers.inet6 import IPv6 from scapy.packet import Raw from framework import VppTestCase, VppTestRunner from vpp_ip import DpoProto -from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable +from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto from socket import AF_INET, AF_INET6, inet_pton """ Test6rd is a subclass of VPPTestCase classes. @@ -56,6 +56,7 @@ class Test6RD(VppTestCase): i.unconfig_ip6() i.set_table_ip4(0) i.set_table_ip6(0) + i.admin_down() super(Test6RD, self).tearDown() def validate_6in4(self, rx, expected): @@ -88,9 +89,13 @@ class Test6RD(VppTestCase): p_ether = Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) p_ip6 = IPv6(src="1::1", dst="2002:AC10:0202::1", nh='UDP') - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=True) + self.tunnel_index = rv.sw_if_index self.vapi.cli("show ip6 fib") @@ -121,10 +126,11 @@ class Test6RD(VppTestCase): 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, 10, - inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg2.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=20, ip4_table_id=10, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg2.local_ip4, + security_check=True) self.tunnel_index = rv.sw_if_index self.vapi.cli("show ip6 fib") @@ -153,14 +159,20 @@ class Test6RD(VppTestCase): def test_6rd_ip4_to_ip6(self): """ ip4 -> ip6 (decap) 6rd test """ - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=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(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=True) self.tunnel_index = rv.sw_if_index p_ip6 = (IPv6(src="2002:AC10:0202::1", dst=self.pg1.remote_ip6) / @@ -181,16 +193,20 @@ class Test6RD(VppTestCase): def test_6rd_ip4_to_ip6_vrf(self): """ ip4 -> ip6 (decap) 6rd VRF test """ - rv = self.vapi.ipip_6rd_add_tunnel(20, 10, - inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg2.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=20, + ip4_table_id=10, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg2.local_ip4, + security_check=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, 10, - inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg2.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=20, + ip4_table_id=10, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg2.local_ip4, + security_check=True) self.tunnel_index = rv.sw_if_index self.vapi.sw_interface_set_table(self.tunnel_index, 1, 20) @@ -214,14 +230,20 @@ class Test6RD(VppTestCase): """ ip4 -> ip6 (decap) 6rd test """ self.tunnel_index = [] - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=True) self.tunnel_index.append(rv.sw_if_index) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2003::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg1.local_ip4, + security_check=True) - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2003::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg1.local_ip4n, 16, 0, True) self.tunnel_index.append(rv.sw_if_index) self.vapi.cli("show ip6 fib") @@ -247,10 +269,12 @@ class Test6RD(VppTestCase): def test_6rd_ip4_to_ip6_suffix(self): """ ip4 -> ip6 (decap) 6rd test """ - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '172.0.0.0'), - self.pg0.local_ip4n, 16, 8, True) - + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='172.0.0.0/8', + ip4_src=self.pg0.local_ip4, + security_check=True) self.tunnel_index = rv.sw_if_index self.vapi.cli("show ip6 fib") @@ -268,9 +292,12 @@ class Test6RD(VppTestCase): def test_6rd_ip4_to_ip6_sec_check(self): """ ip4 -> ip6 (decap) security check 6rd test """ - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, True) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=True) self.tunnel_index = rv.sw_if_index self.vapi.cli("show ip6 fib") @@ -300,16 +327,18 @@ class Test6RD(VppTestCase): def test_6rd_bgp_tunnel(self): """ 6rd BGP tunnel """ - rv = self.vapi.ipip_6rd_add_tunnel(0, 0, inet_pton(AF_INET6, '2002::'), - inet_pton(AF_INET, '0.0.0.0'), - self.pg0.local_ip4n, 16, 0, False) + rv = self.vapi.ipip_6rd_add_tunnel(ip6_table_id=0, + ip4_table_id=0, + ip6_prefix='2002::/16', + ip4_prefix='0.0.0.0/0', + ip4_src=self.pg0.local_ip4, + security_check=False) + self.tunnel_index = rv.sw_if_index - default_route = VppIpRoute( - self, "DEAD::", 16, [VppRoutePath("2002:0808:0808::", - self.tunnel_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + default_route = VppIpRoute(self, "DEAD::", 16, + [VppRoutePath("2002:0808:0808::", + self.tunnel_index)]) default_route.add_vpp_config() ip4_route = VppIpRoute(self, "8.0.0.0", 8,