X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_gre.py;h=c5239b2cf9da6da5b9f6eb3612477d083f756556;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=7936334ba77b3503e197663aaab26ad1adffcd07;hpb=39baa32186fd3e4b20d9f58afbbfe7b8daebed62;p=vpp.git diff --git a/test/test_gre.py b/test/test_gre.py index 7936334ba77..c5239b2cf9d 100644 --- a/test/test_gre.py +++ b/test/test_gre.py @@ -13,7 +13,7 @@ from framework import VppTestCase, VppTestRunner from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint from vpp_gre_interface import VppGreInterface from vpp_ip import DpoProto -from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable +from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, FibPathProto from util import ppp, ppc from vpp_papi import VppEnum @@ -576,8 +576,7 @@ class TestGRE(VppTestCase): self, "2001::1", 128, [VppRoutePath("::", gre_if.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + proto=DpoProto.DPO_PROTO_IP6)]) route6_via_tun.add_vpp_config() tx = self.create_stream_ip6(self.pg0, "2001::2", "2001::1") @@ -615,12 +614,9 @@ class TestGRE(VppTestCase): gre_if.admin_up() gre_if.config_ip6() - route_via_tun = VppIpRoute( - self, "4004::1", 128, - [VppRoutePath("0::0", - gre_if.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_via_tun = VppIpRoute(self, "4004::1", 128, + [VppRoutePath("0::0", + gre_if.sw_if_index)]) route_via_tun.add_vpp_config() @@ -638,12 +634,9 @@ class TestGRE(VppTestCase): # # Add a route that resolves the tunnel's destination # - route_tun_dst = VppIpRoute( - self, "1002::1", 128, - [VppRoutePath(self.pg2.remote_ip6, - self.pg2.sw_if_index, - proto=DpoProto.DPO_PROTO_IP6)], - is_ip6=1) + route_tun_dst = VppIpRoute(self, "1002::1", 128, + [VppRoutePath(self.pg2.remote_ip6, + self.pg2.sw_if_index)]) route_tun_dst.add_vpp_config() #