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 Activity

lib: Addon: add new Bridge class with member "bridge_vlan_aware_list"

Browse Source 
we need to keep track of how many vlan-aware bridge we have in the user
configuration without having to loop over all ifaceobjs again. So we
store their name as they go through get_dependent_ifacenames

Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
Julien Fortin
2021-04-07 23:25:24 +02:00
parent d8b7a21e42
commit 5f4ab65948
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ifupdown2/addons/bridge.py
View File

@@ -11,7 +11,7 @@ import itertools
from collections import Counter from collections import Counter
try: try:
from ifupdown2.lib.addon import Addon from ifupdown2.lib.addon import Bridge
import ifupdown2.ifupdown.exceptions as exceptions import ifupdown2.ifupdown.exceptions as exceptions
import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.policymanager as policymanager
@@ -25,7 +25,7 @@ try:
from ifupdown2.ifupdownaddons.cache import * from ifupdown2.ifupdownaddons.cache import *
from ifupdown2.ifupdownaddons.modulebase import moduleBase from ifupdown2.ifupdownaddons.modulebase import moduleBase
except (ImportError, ModuleNotFoundError): except (ImportError, ModuleNotFoundError):
from lib.addon import Addon from lib.addon import Bridge
import ifupdown.exceptions as exceptions import ifupdown.exceptions as exceptions
import ifupdown.policymanager as policymanager import ifupdown.policymanager as policymanager
@@ -45,7 +45,7 @@ class bridgeFlags:
PORT_PROCESSED_OVERRIDE = 0x2 PORT_PROCESSED_OVERRIDE = 0x2
class bridge(Addon, moduleBase): class bridge(Bridge, moduleBase):
""" ifupdown2 addon module to configure linux bridges """ """ ifupdown2 addon module to configure linux bridges """
_modinfo = { _modinfo = {
@@ -631,7 +631,7 @@ class bridge(Addon, moduleBase):
) )
def __init__(self, *args, **kargs): def __init__(self, *args, **kargs):
Addon.__init__(self) Bridge.__init__(self)
moduleBase.__init__(self, *args, **kargs) moduleBase.__init__(self, *args, **kargs)
self.name = self.__class__.__name__ self.name = self.__class__.__name__
self._resv_vlan_range = self._get_reserved_vlan_range() self._resv_vlan_range = self._get_reserved_vlan_range()
@@ -979,6 +979,10 @@ class bridge(Addon, moduleBase):
if utils.get_boolean_from_string(ifaceobj.get_attr_value_first('bridge-vlan-aware')): if utils.get_boolean_from_string(ifaceobj.get_attr_value_first('bridge-vlan-aware')):
ifaceobj.link_kind |= ifaceLinkKind.BRIDGE ifaceobj.link_kind |= ifaceLinkKind.BRIDGE
ifaceobj.link_privflags |= ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE ifaceobj.link_privflags |= ifaceLinkPrivFlags.BRIDGE_VLAN_AWARE
# store the name of all bridge vlan aware in a global list
self.bridge_vlan_aware_list.append(ifaceobj.name)
ifaceobj.role |= ifaceRole.MASTER ifaceobj.role |= ifaceRole.MASTER
ifaceobj.dependency_type = ifaceDependencyType.MASTER_SLAVE ifaceobj.dependency_type = ifaceDependencyType.MASTER_SLAVE
return self.parse_port_list(ifaceobj.name, return self.parse_port_list(ifaceobj.name,

8
ifupdown2/lib/addon.py
View File

@@ -80,3 +80,11 @@ class Addon(Netlink, Cache):
for user_attr, user_value in ifaceobj.config.items() for user_attr, user_value in ifaceobj.config.items()
] ]
) )
class Bridge(Addon):
bridge_vlan_aware_list = []
def __init__(self):
super(Bridge, self).__init__()