X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_gtpu.py;h=957181a71e45b04f2f709d3db0ee5dbc002a9629;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=9f3c090726e50550b5000815258d27ede3108e57;hpb=ebae4196b2a4cd7470ec2ec8ade9b375a894eee7;p=vpp.git

diff --git a/test/test_gtpu.py b/test/test_gtpu.py
index 9f3c090726e..957181a71e4 100644
--- a/test/test_gtpu.py
+++ b/test/test_gtpu.py
@@ -11,13 +11,15 @@ from scapy.layers.inet import IP, UDP
 from scapy.layers.inet6 import IPv6
 from scapy.contrib.gtp import GTP_U_Header
 from scapy.utils import atol
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip import INVALID_INDEX
 
 
 class TestGtpuUDP(VppTestCase):
     """ GTPU UDP ports Test Case """
 
     def setUp(self):
-        super(TestGtpuUDP, self).tearDown()
+        super(TestGtpuUDP, self).setUp()
 
         self.dport = 2152
 
@@ -224,13 +226,16 @@ class TestGtpu(BridgeDomain, VppTestCase):
         # Create 10 ucast gtpu tunnels under bd
         ip_range_start = 10
         ip_range_end = ip_range_start + n_ucast_tunnels
-        next_hop_address = cls.pg0.remote_ip4n
-        for dest_ip4n in ip4n_range(next_hop_address, ip_range_start,
-                                    ip_range_end):
+        next_hop_address = cls.pg0.remote_ip4
+        for dest_ip4 in ip4_range(next_hop_address, ip_range_start,
+                                  ip_range_end):
             # add host route so dest_ip4n will not be resolved
-            cls.vapi.ip_add_del_route(dst_address=dest_ip4n,
-                                      dst_address_length=32,
-                                      next_hop_address=next_hop_address)
+            rip = VppIpRoute(cls, dest_ip4, 32,
+                             [VppRoutePath(next_hop_address,
+                                           INVALID_INDEX)],
+                             register=False)
+            rip.add_vpp_config()
+            dest_ip4n = socket.inet_pton(socket.AF_INET, dest_ip4)
             r = cls.vapi.gtpu_add_del_tunnel(
                 src_addr=cls.pg0.local_ip4n,
                 dst_addr=dest_ip4n,