summaryrefslogtreecommitdiffstats
path: root/test/vpp_gre_interface.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/vpp_gre_interface.py')
-rw-r--r--test/vpp_gre_interface.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index 998f6eab32b..91293c3d28c 100644
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -8,7 +8,8 @@ class VppGreInterface(VppInterface):
VPP GRE interface
"""
- def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
+ def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
+ session=0):
""" Create VPP GRE interface """
self._sw_if_index = 0
super(VppGreInterface, self).__init__(test)
@@ -16,14 +17,16 @@ class VppGreInterface(VppInterface):
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
- self.t_is_teb = is_teb
+ self.t_type = type
+ self.t_session = session
def add_vpp_config(self):
s = socket.inet_pton(socket.AF_INET, self.t_src)
d = socket.inet_pton(socket.AF_INET, self.t_dst)
r = self.test.vapi.gre_tunnel_add_del(s, d,
outer_fib_id=self.t_outer_fib,
- is_teb=self.t_is_teb)
+ tunnel_type=self.t_type,
+ session_id=self.t_session)
self._sw_if_index = r.sw_if_index
self.generate_remote_hosts()
self._test.registry.register(self, self._test.logger)
@@ -34,6 +37,8 @@ class VppGreInterface(VppInterface):
self.unconfig()
self.test.vapi.gre_tunnel_add_del(s, d,
outer_fib_id=self.t_outer_fib,
+ tunnel_type=self.t_type,
+ session_id=self.t_session,
is_add=0)
def __str__(self):
@@ -48,7 +53,8 @@ class VppGre6Interface(VppInterface):
VPP GRE IPv6 interface
"""
- def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
+ def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
+ session=0):
""" Create VPP GRE interface """
self._sw_if_index = 0
super(VppGre6Interface, self).__init__(test)
@@ -56,14 +62,16 @@ class VppGre6Interface(VppInterface):
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
- self.t_is_teb = is_teb
+ self.t_type = type
+ self.t_session = session
def add_vpp_config(self):
s = socket.inet_pton(socket.AF_INET6, self.t_src)
d = socket.inet_pton(socket.AF_INET6, self.t_dst)
r = self.test.vapi.gre_tunnel_add_del(s, d,
outer_fib_id=self.t_outer_fib,
- is_teb=self.t_is_teb,
+ tunnel_type=self.t_type,
+ session_id=self.t_session,
is_ip6=1)
self._sw_if_index = r.sw_if_index
self.generate_remote_hosts()
@@ -75,6 +83,8 @@ class VppGre6Interface(VppInterface):
self.unconfig()
self.test.vapi.gre_tunnel_add_del(s, d,
outer_fib_id=self.t_outer_fib,
+ tunnel_type=self.t_type,
+ session_id=self.t_session,
is_add=0,
is_ip6=1)