summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNeale Ranns <neale.ranns@cisco.com>2018-08-22 00:21:14 -0700
committerDamjan Marion <dmarion@me.com>2018-08-22 20:29:40 +0000
commit6150211538ef37e317a1a68cd4d8f169d87becd2 (patch)
treeba960bed8660329c3d349460ad9ffd4bf110194c /test
parent5779a441acaf1f613f548668262d8f9bb07560f2 (diff)
IPIP and SIXRD tunnels create API needs table-IDs not fib-indexes
Change-Id: Ifaef196a24fa9b6924f2b9692318f69763cee5e1 Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_ipip.py14
-rw-r--r--test/test_sixrd.py150
-rw-r--r--test/vpp_papi_provider.py11
3 files changed, 134 insertions, 41 deletions
diff --git a/test/test_ipip.py b/test/test_ipip.py
index 8d99f83e6c2..fc74d274b1f 100644
--- a/test/test_ipip.py
+++ b/test/test_ipip.py
@@ -5,7 +5,7 @@ import unittest
from scapy.layers.inet6 import IPv6, Ether, IP, UDP
from scapy.all import fragment, RandShort
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
import StringIO
@@ -303,6 +303,18 @@ class TestIPIP(VppTestCase):
sw_if_index = rv.sw_if_index
self.vapi.ipip_del_tunnel(sw_if_index)
+ def test_ipip_vrf_create(self):
+ """ ipip create / delete interface VRF test """
+
+ t = VppIpTable(self, 20)
+ t.add_vpp_config()
+ rv = self.vapi.ipip_add_tunnel(
+ src_address=inet_pton(AF_INET, '1.2.3.4'),
+ dst_address=inet_pton(AF_INET, '2.3.4.5'), is_ipv6=0,
+ table_id=20)
+ sw_if_index = rv.sw_if_index
+ self.vapi.ipip_del_tunnel(sw_if_index)
+
def payload(self, len):
return 'x' * len
diff --git a/test/test_sixrd.py b/test/test_sixrd.py
index c6b3c088516..7656c3f4e7c 100644
--- 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 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.
@@ -22,13 +22,23 @@ class Test6RD(VppTestCase):
@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)
- 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()
+ if (n > 1):
+ i.set_table_ip4(10)
+ i.set_table_ip6(20)
i.config_ip4()
i.config_ip6()
i.disable_ipv6_ra()
@@ -36,17 +46,12 @@ class Test6RD(VppTestCase):
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()
- 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:
@@ -80,7 +85,7 @@ class Test6RD(VppTestCase):
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
@@ -105,20 +110,55 @@ class Test6RD(VppTestCase):
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(
- 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(
- 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) /
@@ -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)
+ 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(
- 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(
- 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")
@@ -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)
+ 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,
- 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
@@ -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)
+ 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(
- 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")
@@ -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)
+ 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(
- 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(
@@ -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)
+ ip4_route.remove_vpp_config()
+ default_route.remove_vpp_config()
+ self.vapi.ipip_6rd_del_tunnel(self.tunnel_index)
if __name__ == '__main__':
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index f9ac7694bf6..17c7e9c4150 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -3431,12 +3431,13 @@ class VppPapiProvider(object):
""" GBP contract Dump """
return self.api(self.papi.gbp_contract_dump, {})
- def ipip_6rd_add_tunnel(self, fib_index, ip6_prefix, ip6_prefix_len,
- ip4_prefix, ip4_prefix_len, ip4_src,
+ def ipip_6rd_add_tunnel(self, ip6_table_id, ip6_prefix, ip6_prefix_len,
+ ip4_table_id, ip4_prefix, ip4_prefix_len, ip4_src,
security_check):
""" 6RD tunnel Add """
return self.api(self.papi.ipip_6rd_add_tunnel,
- {'fib_index': fib_index,
+ {'ip4_table_id': ip4_table_id,
+ 'ip6_table_id': ip6_table_id,
'ip6_prefix': ip6_prefix,
'ip6_prefix_len': ip6_prefix_len,
'ip4_prefix': ip4_prefix,
@@ -3450,14 +3451,14 @@ class VppPapiProvider(object):
{'sw_if_index': sw_if_index})
def ipip_add_tunnel(self, src_address, dst_address, is_ipv6=1,
- instance=0xFFFFFFFF, fib_index=0, tc_tos=0):
+ instance=0xFFFFFFFF, table_id=0, tc_tos=0):
""" IPIP tunnel Add/Del """
return self.api(self.papi.ipip_add_tunnel,
{'is_ipv6': is_ipv6,
'instance': instance,
'src_address': src_address,
'dst_address': dst_address,
- 'fib_index': fib_index,
+ 'table_id': table_id,
'tc_tos': tc_tos})
def ipip_del_tunnel(self, sw_if_index):