ip-neighbor: Replace feature for the ip-neighbor data-base

[vpp.git] / test / test_geneve.py

diff --git a/test/test_geneve.py b/test/test_geneve.py
index ffa8fb8..7eb23f2 100644 (file)
--- a/test/test_geneve.py
+++ b/test/test_geneve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 from util import ip4_range, ip4_range
@@ -8,7 +8,7 @@ from template_bd import BridgeDomain
 
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
-from scapy.layers.geneve import GENEVE
+from scapy.contrib.geneve import GENEVE
 from scapy.utils import atol
 from vpp_ip_route import VppIpRoute, VppRoutePath
 from vpp_ip import INVALID_INDEX
@@ -137,7 +137,7 @@ class TestGeneve(BridgeDomain, VppTestCase):
         ip_range_end = ip_range_start + n_distinct_dst_tunnels
         for dest_ip4 in ip4_range(cls.mcast_ip4, ip_range_start,
                                   ip_range_end):
-            vni = bytearray(dest_ip4)[3]
+            vni = int(dest_ip4.split('.')[3])
             cls.vapi.geneve_add_del_tunnel(local_address=cls.pg0.local_ip4,
                                            remote_address=dest_ip4,
                                            mcast_sw_if_index=1, is_add=is_add,
@@ -182,10 +182,11 @@ class TestGeneve(BridgeDomain, VppTestCase):
 
             # Create GENEVE VTEP on VPP pg0, and put geneve_tunnel0 and pg1
             #  into BD.
+            cls.single_tunnel_vni = 0xabcde
             cls.single_tunnel_bd = 1
             r = cls.vapi.geneve_add_del_tunnel(
                 local_address=cls.pg0.local_ip4,
-                remote_address=cls.pg0.remote_ip4, vni=cls.single_tunnel_bd)
+                remote_address=cls.pg0.remote_ip4, vni=cls.single_tunnel_vni)
             cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
                                                 bd_id=cls.single_tunnel_bd)
             cls.vapi.sw_interface_set_l2_bridge(