mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

addons: bridge: ifquery-running support for bridge-vlan-vni-map

Browse Source 
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-04-22 22:54:20 +02:00
parent b2751c6f57
commit d42c5f307e
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ifupdown2/addons/bridge.py
View File

@ -3669,7 +3669,7 @@ class bridge(Bridge, moduleBase):
ifaceobjcurr.update_config_with_status("bridge-vlan-vni-map", bridge_vlan_vni_map_entry, fail)
@staticmethod
def get_vlan_vni_ranges(bridge_vlan_tunnel):
def get_vlan_vni_ranges(bridge_vlan_tunnel, compress=False):
vlans = []
vnis = []
@ -3686,8 +3686,13 @@ class bridge(Bridge, moduleBase):
tunnel_vni_range = tunnel_vni
elif tunnel_flags & Link.BRIDGE_VLAN_INFO_RANGE_END:
vlans.extend(range(tunnel_vlan_range, tunnel_vlan + 1))
vnis.extend(range(tunnel_vni_range, tunnel_vni + 1))
if compress:
vlans.append("%s-%s" % (tunnel_vlan_range, tunnel_vlan))
vnis.append("%s-%s" % (tunnel_vni_range, tunnel_vni))
else:
vlans.extend(range(tunnel_vlan_range, tunnel_vlan + 1))
vnis.extend(range(tunnel_vni_range, tunnel_vni + 1))
else:
vlans.append(tunnel_vlan)
@ -3879,6 +3884,22 @@ class bridge(Bridge, moduleBase):
self._query_running_bridge_port_attrs(ifaceobjrunning, bridgename)
#
# bridge-vlan-vni-map
#
try:
cached_vlans, cached_vnis = self.get_vlan_vni_ranges(
self.cache.get_vlan_vni(ifaceobjrunning.name), compress=True
)
if cached_vlans and cached_vnis:
ifaceobjrunning.update_config(
"bridge-vlan-vni-map",
" ".join(["%s=%s" % (vlan, vni) for vlan, vni in zip(cached_vlans, cached_vnis)])
)
except Exception as e:
self.logger.debug("bridge-vlan-vni-map: exception: %s" % str(e))
def _query_running(self, ifaceobjrunning, ifaceobj_getfunc=None):
try:
if self.cache.bridge_exists(ifaceobjrunning.name):