7eac916e1b
Refactors the GRE node to work with both IPv4 and IPv6 transports. Note that this changes the binary configuration API to support both address families; each address uses the same memory for either address type and a flag to indicate which is in use. The CLI and VAT syntax remains unchanged; the code detects whether an IPv4 or an IPv6 address was given. Configuration examples: IPv4 CLI: create gre tunnel src 192.168.1.1 dst 192.168.1.2 IPv6 CLI: create gre tunnel src 2620:124:9000::1 dst 2620:124:9000::2 IPv4 VAT: gre_add_del_tunnel src 192.168.1.1 dst 192.168.1.2 IPv6 VAT: gre_add_del_tunnel src 2620:124:9000::1 dst 2620:124:9000::2 Change-Id: Ica8ee775dc101047fb8cd41617ddc8fafc2741b0 Signed-off-by: Ciara Loftus <ciara.loftus@intel.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 loopback 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 loopback 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)
|