X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_map.py;fp=test%2Ftest_map.py;h=f1388b39c65fdb42ccb0a653d59bb7407501af0d;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=39698cd2f7d4bd0cd9872039f9e7be42bac5a64b;hpb=39baa32186fd3e4b20d9f58afbbfe7b8daebed62;p=vpp.git

diff --git a/test/test_map.py b/test/test_map.py
index 39698cd2f7d..f1388b39c65 100644
--- a/test/test_map.py
+++ b/test/test_map.py
@@ -2,6 +2,7 @@
 
 import ipaddress
 import unittest
+from ipaddress import IPv6Network, IPv4Network
 
 from framework import VppTestCase, VppTestRunner
 from vpp_ip import DpoProto
@@ -105,9 +106,7 @@ class TestMAP(VppTestCase):
                                map_br_pfx,
                                map_br_pfx_len,
                                [VppRoutePath(self.pg1.remote_ip6,
-                                             self.pg1.sw_if_index,
-                                             proto=DpoProto.DPO_PROTO_IP6)],
-                               is_ip6=1)
+                                             self.pg1.sw_if_index)])
         map_route.add_vpp_config()
 
         #
@@ -198,12 +197,9 @@ class TestMAP(VppTestCase):
         # Add a route to 4001::1. Expect the encapped traffic to be
         # sent via that routes next-hop
         #
-        pre_res_route = VppIpRoute(
-            self, "4001::1", 128,
-            [VppRoutePath(self.pg1.remote_hosts[2].ip6,
-                          self.pg1.sw_if_index,
-                          proto=DpoProto.DPO_PROTO_IP6)],
-            is_ip6=1)
+        pre_res_route = VppIpRoute(self, "4001::1", 128,
+                                   [VppRoutePath(self.pg1.remote_hosts[2].ip6,
+                                                 self.pg1.sw_if_index)])
         pre_res_route.add_vpp_config()
 
         self.send_and_assert_encapped(v4, "3000::1",
@@ -214,8 +210,7 @@ class TestMAP(VppTestCase):
         # change the route to the pre-solved next-hop
         #
         pre_res_route.modify([VppRoutePath(self.pg1.remote_hosts[3].ip6,
-                                           self.pg1.sw_if_index,
-                                           proto=DpoProto.DPO_PROTO_IP6)])
+                                           self.pg1.sw_if_index)])
         pre_res_route.add_vpp_config()
 
         self.send_and_assert_encapped(v4, "3000::1",
@@ -289,8 +284,7 @@ class TestMAP(VppTestCase):
                                32,
                                [VppRoutePath(self.pg1.remote_ip6,
                                              self.pg1.sw_if_index,
-                                             proto=DpoProto.DPO_PROTO_IP6)],
-                               is_ip6=1)
+                                             proto=DpoProto.DPO_PROTO_IP6)])
         map_route.add_vpp_config()
 
         #