a43ccaefc3
Change GRE tunnel to use the interface type where the same encap node is used as output node for all GRE tunnels, instead of having dedicated output and tx node for each tunnel. This allows for more efficient tunnel creation and deletion at scale tested at 1000's of GRE tunnels. Add support for ERSPAN encap as another tunnel type, in addition to the existing L3 and TEB types. The GRE ERSPAN encap supported is type 2 thus GRE encap need to include sequence number and GRE- ERSPAN tunnel can be created with user secified ERSPAN session ID. The GRE tunnel lookup hash key is updated to inclue tunnel type and session ID, in addition to SIP/DIP and FIB index. Thus, GRE-ERSPAN tunnel can be created, with the appropriate session ID, to be used as output interface for SPAN config to send mirrored packets. Change interface naming so that all GRE tunnels, irrespective of tunnel type, uses "greN" where N is the instance number. Removed interface reuse on tunnel creation and deletion to enable unfied tunnel interface name. Add support of user specified instance on GRE tunnel creation. Thus, N in the "greN" interface name can optionally be specified by user via CLI/API. Optimize GRE tunnel encap DPO stacking to bypass load-balance DPO node since packet output on GRE tunnel always belong to the same flow after 5-tupple hash. Change-Id: Ifa83915744a1a88045c998604777cc3583f4da52 Signed-off-by: John Lo <loj@cisco.com>
96 lines
3.4 KiB
Python
96 lines
3.4 KiB
Python
|
|
from vpp_interface import VppInterface
|
|
import socket
|
|
|
|
|
|
class VppGreInterface(VppInterface):
|
|
"""
|
|
VPP GRE interface
|
|
"""
|
|
|
|
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)
|
|
self._test = 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_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,
|
|
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)
|
|
|
|
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_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):
|
|
return self.object_id()
|
|
|
|
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 """
|
|
self._sw_if_index = 0
|
|
super(VppGre6Interface, self).__init__(test)
|
|
self._test = 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_tunnel_add_del(s, d,
|
|
outer_fib_id=self.t_outer_fib,
|
|
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()
|
|
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_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)
|
|
|
|
def __str__(self):
|
|
return self.object_id()
|
|
|
|
def object_id(self):
|
|
return "gre-%d" % self._sw_if_index
|