ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GRE: API update

Browse Source 
Change-Id: I5010cd34123c6498230dedac6ba8dd774a1085f9
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2019-04-16 07:15:35 +00:00
committed by Damjan Marion
parent 06a6a30f91
commit 5a8844bdbf
11 changed files with 260 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
test/vpp_gre_interface.py
View File

@ -1,6 +1,7 @@
from vpp_interface import VppInterface
import socket
from vpp_papi import VppEnum
class VppGreInterface(VppInterface):
@ -8,20 +9,22 @@ class VppGreInterface(VppInterface):
VPP GRE interface
"""
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=None,
session=0):
""" Create VPP GRE interface """
super(VppGreInterface, self).__init__(test)
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
self.t_type = type
self.t_session = session
self.t_type = type
if not self.t_type:
self.t_type = (VppEnum.vl_api_gre_tunnel_type_t.
GRE_API_TUNNEL_TYPE_L3)
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_add_del_tunnel(s, d,
r = self.test.vapi.gre_tunnel_add_del(self.t_src,
self.t_dst,
outer_fib_id=self.t_outer_fib,
tunnel_type=self.t_type,
session_id=self.t_session)
@ -30,10 +33,9 @@ class VppGreInterface(VppInterface):
self.test.registry.register(self, self.test.logger)
def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET, self.t_src)
d = socket.inet_pton(socket.AF_INET, self.t_dst)
self.unconfig()
self.test.vapi.gre_add_del_tunnel(s, d,
self.test.vapi.gre_tunnel_add_del(self.t_src,
self.t_dst,
outer_fib_id=self.t_outer_fib,
tunnel_type=self.t_type,
session_id=self.t_session,
@ -42,44 +44,6 @@ class VppGreInterface(VppInterface):
def object_id(self):
return "gre-%d" % self.sw_if_index
class VppGre6Interface(VppInterface):
"""
VPP GRE IPv6 interface
"""
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
session=0):
""" Create VPP GRE interface """
super(VppGre6Interface, self).__init__(test)
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
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_add_del_tunnel(s, d,
outer_fib_id=self.t_outer_fib,
tunnel_type=self.t_type,
session_id=self.t_session,
is_ip6=1)
self.set_sw_if_index(r.sw_if_index)
self.generate_remote_hosts()
self.test.registry.register(self, self.test.logger)
def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET6, self.t_src)
d = socket.inet_pton(socket.AF_INET6, self.t_dst)
self.unconfig()
self.test.vapi.gre_add_del_tunnel(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)
def object_id(self):
return "gre-%d" % self._sw_if_index
def query_vpp_config(self):
return (self.test.vapi.gre_tunnel_dump(
sw_if_index=self._sw_if_index))