X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_sixrd.py;h=24ff74b8d1c72da2deab505ff89fb5e5cabc9297;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=9eeae57d37f7b24a9b77507fb9a129a05e4fcb27;hpb=288e093624515e31a8bc0f0f870e5a9c7fa2dbaa;p=vpp.git diff --git a/test/test_sixrd.py b/test/test_sixrd.py index 9eeae57d37f..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): @@ -335,11 +336,9 @@ class Test6RD(VppTestCase): 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,