misc: add address sanitizer heap instrumentation

[vpp.git] / test / test_vxlan_gpe.py

diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py
index 7ee1225..5622a03 100644 (file)
--- a/test/test_vxlan_gpe.py
+++ b/test/test_vxlan_gpe.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

 
 import socket
 from util import ip4n_range, ip4_range
 
 import socket
 from util import ip4n_range, ip4_range


@@ -10,6 +10,8 @@ from scapy.layers.l2 import Ether, Raw
 from scapy.layers.inet import IP, UDP
 from scapy.layers.vxlan import VXLAN
 from scapy.utils import atol
 from scapy.layers.inet import IP, UDP
 from scapy.layers.vxlan import VXLAN
 from scapy.utils import atol

+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip import INVALID_INDEX

 
 
 @unittest.skipUnless(running_extended_tests, "part of extended tests")
 
 
 @unittest.skipUnless(running_extended_tests, "part of extended tests")


@@ -80,16 +82,20 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
 
     @classmethod
     def create_vxlan_gpe_flood_test_bd(cls, vni, n_ucast_tunnels):
 
     @classmethod
     def create_vxlan_gpe_flood_test_bd(cls, vni, n_ucast_tunnels):

-        # Create 10 ucast vxlan_gpe tunnels under bd
+        # Create 10 ucast vxlan tunnels under bd

         ip_range_start = 10
         ip_range_end = ip_range_start + n_ucast_tunnels
         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
             # 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.vxlan_gpe_add_del_tunnel(
                 src_addr=cls.pg0.local_ip4n,
                 dst_addr=dest_ip4n,
             r = cls.vapi.vxlan_gpe_add_del_tunnel(
                 src_addr=cls.pg0.local_ip4n,
                 dst_addr=dest_ip4n,