X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_span.py;h=ecefe153706e09472da083c026ae774ad5d9b1c2;hb=7c0eb56f4;hp=e4b0d0ad2b48c2c83a87e2f6244479ae8f8a58d2;hpb=5a8844bdbf4b055812cce2d7755a175b2cc90b75;p=vpp.git

diff --git a/test/test_span.py b/test/test_span.py
index e4b0d0ad2b4..ecefe153706 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
@@ -11,6 +11,7 @@ from framework import VppTestCase, VppTestRunner
 from util import Host, ppp
 from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint, VppDot1ADSubint
 from vpp_gre_interface import VppGreInterface
+from vpp_vxlan_tunnel import VppVxlanTunnel
 from collections import namedtuple
 from vpp_papi import VppEnum
 
@@ -53,12 +54,11 @@ class TestSpan(VppTestCase):
             i.config_ip4()
             i.resolve_arp()
 
-        cls.vxlan = cls.vapi.vxlan_add_del_tunnel(
-            src_address=cls.pg2.local_ip4n, dst_address=cls.pg2.remote_ip4n,
-            is_add=1, vni=1111)
-
     def setUp(self):
         super(TestSpan, self).setUp()
+        self.vxlan = VppVxlanTunnel(self, src=self.pg2.local_ip4,
+                                    dst=self.pg2.remote_ip4, vni=1111)
+        self.vxlan.add_vpp_config()
         self.reset_packet_infos()
 
     def tearDown(self):
@@ -144,7 +144,7 @@ class TestSpan(VppTestCase):
 
         for i in range(0, self.pkts_per_burst):
             payload = "span test"
-            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            size = packet_sizes[int((i / 2) % len(packet_sizes))]
             p = (Ether(src=src_if.local_mac, dst=dst_mac) /
                  IP(src=src_if.remote_ip4, dst=dst_if.remote_ip4) /
                  UDP(sport=10000 + src_if.sw_if_index * 1000 + i, dport=1234) /
@@ -235,7 +235,7 @@ class TestSpan(VppTestCase):
 
         self.sub_if.admin_up()
         self.vapi.sw_interface_set_flags(self.vxlan.sw_if_index,
-                                         admin_up_down=1)
+                                         flags=1)
 
         self.bridge(self.vxlan.sw_if_index, is_add=1)
         # Create bi-directional cross-connects between pg0 subif and pg1