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

vxlan: add udp-port configuration support

Browse Source 
Type: improvement

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
Change-Id: Ie30d51ab4df5599b52f7335f863b930cd69dbdc1
This commit is contained in:
Artem Glazychev
2020-12-01 02:39:21 +07:00
committed by Ole Tr�an
parent 6b354914c2
commit 839dcc0fb7
8 changed files with 564 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/vpp_vxlan_tunnel.py
View File

@ -3,13 +3,26 @@ from vpp_papi import VppEnum
INDEX_INVALID = 0xffffffff
DEFAULT_PORT = 4789
UNDEFINED_PORT = 0
def find_vxlan_tunnel(test, src, dst, vni):
ts = test.vapi.vxlan_tunnel_dump(INDEX_INVALID)
def find_vxlan_tunnel(test, src, dst, s_port, d_port, vni):
ts = test.vapi.vxlan_tunnel_v2_dump(INDEX_INVALID)
src_port = DEFAULT_PORT
if s_port != UNDEFINED_PORT:
src_port = s_port
dst_port = DEFAULT_PORT
if d_port != UNDEFINED_PORT:
dst_port = d_port
for t in ts:
if src == str(t.src_address) and \
dst == str(t.dst_address) and \
src_port == t.src_port and \
dst_port == t.dst_port and \
t.vni == vni:
return t.sw_if_index
return INDEX_INVALID
@ -20,7 +33,9 @@ class VppVxlanTunnel(VppInterface):
VPP VXLAN interface
"""
def __init__(self, test, src, dst, vni, mcast_itf=None,
def __init__(self, test, src, dst, vni,
src_port=UNDEFINED_PORT, dst_port=UNDEFINED_PORT,
mcast_itf=None,
mcast_sw_if_index=INDEX_INVALID,
decap_next_index=INDEX_INVALID,
encap_vrf_id=None, instance=0xffffffff):
@ -29,6 +44,8 @@ class VppVxlanTunnel(VppInterface):
self.src = src
self.dst = dst
self.vni = vni
self.src_port = src_port
self.dst_port = dst_port
self.mcast_itf = mcast_itf
self.mcast_sw_if_index = mcast_sw_if_index
self.encap_vrf_id = encap_vrf_id
@ -39,8 +56,9 @@ class VppVxlanTunnel(VppInterface):
self.mcast_sw_if_index = self.mcast_itf.sw_if_index
def add_vpp_config(self):
reply = self.test.vapi.vxlan_add_del_tunnel(
reply = self.test.vapi.vxlan_add_del_tunnel_v2(
is_add=1, src_address=self.src, dst_address=self.dst, vni=self.vni,
src_port=self.src_port, dst_port=self.dst_port,
mcast_sw_if_index=self.mcast_sw_if_index,
encap_vrf_id=self.encap_vrf_id,
instance=self.instance, decap_next_index=self.decap_next_index)
@ -48,8 +66,9 @@ class VppVxlanTunnel(VppInterface):
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
self.test.vapi.vxlan_add_del_tunnel(
self.test.vapi.vxlan_add_del_tunnel_v2(
is_add=0, src_address=self.src, dst_address=self.dst, vni=self.vni,
src_port=self.src_port, dst_port=self.dst_port,
mcast_sw_if_index=self.mcast_sw_if_index,
encap_vrf_id=self.encap_vrf_id, instance=self.instance,
decap_next_index=self.decap_next_index)
@ -58,6 +77,8 @@ class VppVxlanTunnel(VppInterface):
return (INDEX_INVALID != find_vxlan_tunnel(self._test,
self.src,
self.dst,
self.src_port,
self.dst_port,
self.vni))
def object_id(self):