33ce60d675
- GRE tunnels with the same src,dst addresses are not the same tunnel - Two data-plane improvements: - the cached key was never updated and so useless - no need to dereference the tunnel's HW interface to get the sw_if_index Change-Id: I2f2ea6e08c759a810b753cec22c497e921a2ca01 Signed-off-by: Neale Ranns <nranns@cisco.com>
72 lines
2.5 KiB
Python
72 lines
2.5 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, is_teb=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_is_teb = is_teb
|
|
|
|
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)
|
|
self._sw_if_index = r.sw_if_index
|
|
self.generate_remote_hosts()
|
|
|
|
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()
|
|
r = self.test.vapi.gre_tunnel_add_del(s, d,
|
|
outer_fib_id=self.t_outer_fib,
|
|
is_add=0)
|
|
|
|
|
|
class VppGre6Interface(VppInterface):
|
|
"""
|
|
VPP GRE IPv6 interface
|
|
"""
|
|
|
|
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=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_is_teb = is_teb
|
|
|
|
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,
|
|
is_ip6=1)
|
|
self._sw_if_index = r.sw_if_index
|
|
self.generate_remote_hosts()
|
|
|
|
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()
|
|
r = self.test.vapi.gre_tunnel_add_del(s, d,
|
|
outer_fib_id=self.t_outer_fib,
|
|
is_add=0,
|
|
is_ip6=1)
|