X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_span.py;h=c67bc7b85878c16ac6dfe8de981865068b046a71;hb=d6f1c9c5141c177a14d011a514e392a9357398fb;hp=78a4f7608ed36b3fe54fad3365c4f5412415f696;hpb=90cf21b5d8fd2d3e531e841dcd752311df5f8a50;p=vpp.git

diff --git a/test/test_span.py b/test/test_span.py
index 78a4f7608ed..c67bc7b8587 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -10,8 +10,10 @@ from scapy.layers.vxlan import VXLAN
 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, VppGre6Interface
+from vpp_gre_interface import VppGreInterface
 from collections import namedtuple
+from vpp_papi import VppEnum
+
 
 Tag = namedtuple('Tag', ['dot1', 'vlan'])
 DOT1AD = 0x88A8
@@ -233,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
@@ -271,8 +273,9 @@ class TestSpan(VppTestCase):
 
         gre_if = VppGreInterface(self, self.pg2.local_ip4,
                                  self.pg2.remote_ip4,
-                                 type=2,
-                                 session=543)
+                                 session=543,
+                                 type=(VppEnum.vl_api_gre_tunnel_type_t.
+                                       GRE_API_TUNNEL_TYPE_ERSPAN))
 
         gre_if.add_vpp_config()
         gre_if.admin_up()
@@ -319,7 +322,8 @@ class TestSpan(VppTestCase):
 
         gre_if = VppGreInterface(self, self.pg2.local_ip4,
                                  self.pg2.remote_ip4,
-                                 type=1)
+                                 type=(VppEnum.vl_api_gre_tunnel_type_t.
+                                       GRE_API_TUNNEL_TYPE_TEB))
 
         gre_if.add_vpp_config()
         gre_if.admin_up()