X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_sixrd.py;h=c6b3c0885168afb48abb0d3fdeb344e9dcc1a382;hb=46c1c11ba08512a5e37392de1ddb306b139a5bcf;hp=ac5061474d57025444417feb31e818a8ffabb89c;hpb=b9ca61be1af028a3c7d7004373e8447cae766132;p=vpp.git diff --git a/test/test_sixrd.py b/test/test_sixrd.py index ac5061474d5..c6b3c088516 100644 --- a/test/test_sixrd.py +++ b/test/test_sixrd.py @@ -1,17 +1,13 @@ -# -# 6RD RFC5969 functional tests -# +#!/usr/bin/env python +""" 6RD RFC5969 functional tests """ import unittest -from scapy.layers.inet import IP, UDP, ICMP +from scapy.layers.inet import IP, UDP, Ether from scapy.layers.inet6 import IPv6 -from scapy.layers.l2 import Ether, GRE from scapy.packet import Raw - -from framework import VppTestCase +from framework import VppTestCase, VppTestRunner from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto -from util import ppp -from ipaddress import * +from socket import AF_INET, AF_INET6, inet_pton """ Test6rd is a subclass of VPPTestCase classes. @@ -26,43 +22,31 @@ class Test6RD(VppTestCase): @classmethod def setUpClass(cls): super(Test6RD, cls).setUpClass() - try: - cls.create_pg_interfaces(range(2)) - cls.interfaces = list(cls.pg_interfaces) - except Exception: - super(Test6RD, cls).tearDownClass() - raise + cls.create_pg_interfaces(range(2)) + cls.interfaces = list(cls.pg_interfaces) def setUp(cls): super(Test6RD, cls).setUp() - try: - for i in cls.interfaces: - i.admin_up() - i.config_ip4() - i.config_ip6() - i.disable_ipv6_ra() - i.resolve_arp() - i.resolve_ndp() - except Exception: - super(Test6RD, cls).tearDown() - raise + for i in cls.interfaces: + i.admin_up() + i.config_ip4() + i.config_ip6() + i.disable_ipv6_ra() + i.resolve_arp() + i.resolve_ndp() def tearDown(self): super(Test6RD, self).tearDown() if not self.vpp_dead: - self.vapi.cli("show hardware") - 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: - rv = self.vapi.ipip_6rd_del_tunnel(sw_if_index) - self.assertEqual(rv.retval, 0) - else: - rv = self.vapi.ipip_6rd_del_tunnel(self.tunnel_index) - self.assertEqual(rv.retval, 0) - self.vapi.cli("show error") + 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: @@ -95,11 +79,9 @@ class Test6RD(VppTestCase): p_ip6 = IPv6(src="1::1", dst="2002:AC10:0202::1", nh='UDP') rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), 16, - str(ip_address('0.0.0.0').packed), 0, - str(ip_address(self.pg0.local_ip4).packed), True) - - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), 16, + 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") @@ -128,19 +110,16 @@ class Test6RD(VppTestCase): """ ip4 -> ip6 (decap) 6rd test """ rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg0.local_ip4).packed), True) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), + 16, 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) - self.assertEqual(rv.retval, 0) rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg0.local_ip4).packed), True) + 0, inet_pton(AF_INET6, '2002::'), + 16, inet_pton(AF_INET, '0.0.0.0'), + 0, self.pg0.local_ip4n, True) self.tunnel_index = rv.sw_if_index - self.assertEqual(rv.retval, 0) p_ip6 = (IPv6(src="2002:AC10:0202::1", dst=self.pg1.remote_ip6) / UDP(sport=1234, dport=1234)) @@ -161,17 +140,15 @@ class Test6RD(VppTestCase): self.tunnel_index = [] rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg0.local_ip4).packed), True) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), + 16, 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, str(ip_address('2003::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg1.local_ip4).packed), True) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2003::'), + 16, 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") @@ -196,10 +173,9 @@ class Test6RD(VppTestCase): """ ip4 -> ip6 (decap) 6rd test """ rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), 16, - str(ip_address('172.0.0.0').packed), 8, - str(ip_address(self.pg0.local_ip4).packed), True) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), 16, + inet_pton(AF_INET, '172.0.0.0'), 8, + self.pg0.local_ip4n, True) self.tunnel_index = rv.sw_if_index @@ -218,10 +194,9 @@ class Test6RD(VppTestCase): """ ip4 -> ip6 (decap) security check 6rd test """ rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg0.local_ip4).packed), True) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), + 16, 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") @@ -251,10 +226,9 @@ class Test6RD(VppTestCase): """ 6rd BGP tunnel """ rv = self.vapi.ipip_6rd_add_tunnel( - 0, str(ip_address('2002::').packed), - 16, str(ip_address('0.0.0.0').packed), - 0, str(ip_address(self.pg0.local_ip4).packed), False) - self.assertEqual(rv.retval, 0) + 0, inet_pton(AF_INET6, '2002::'), + 16, inet_pton(AF_INET, '0.0.0.0'), + 0, self.pg0.local_ip4n, False) self.tunnel_index = rv.sw_if_index default_route = VppIpRoute(