From 5f4ab659489b9a65e501d98d6dbdb7cf96e10452 Mon Sep 17 00:00:00 2001
From: Julien Fortin <jfortin@nvidia.com>
Date: Wed, 7 Apr 2021 23:25:24 +0200
Subject: [PATCH] lib: Addon: add new Bridge class with member
 "bridge_vlan_aware_list"

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>
---
 ifupdown2/addons/bridge.py | 12 ++++++++----
 ifupdown2/lib/addon.py     |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
index f786b3f..db61241 100644
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
@@ -11,7 +11,7 @@ import itertools
 from collections import Counter
 
 try:
-    from ifupdown2.lib.addon import Addon
+    from ifupdown2.lib.addon import Bridge
 
     import ifupdown2.ifupdown.exceptions as exceptions
     import ifupdown2.ifupdown.policymanager as policymanager
@@ -25,7 +25,7 @@ try:
     from ifupdown2.ifupdownaddons.cache import *
     from ifupdown2.ifupdownaddons.modulebase import moduleBase
 except (ImportError, ModuleNotFoundError):
-    from lib.addon import Addon
+    from lib.addon import Bridge
 
     import ifupdown.exceptions as exceptions
     import ifupdown.policymanager as policymanager
@@ -45,7 +45,7 @@ class bridgeFlags:
     PORT_PROCESSED_OVERRIDE = 0x2
 
 
-class bridge(Addon, moduleBase):
+class bridge(Bridge, moduleBase):
     """  ifupdown2 addon module to configure linux bridges """
 
     _modinfo = {
@@ -631,7 +631,7 @@ class bridge(Addon, moduleBase):
     )
 
     def __init__(self, *args, **kargs):
-        Addon.__init__(self)
+        Bridge.__init__(self)
         moduleBase.__init__(self, *args, **kargs)
         self.name = self.__class__.__name__
         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')):
             ifaceobj.link_kind |= ifaceLinkKind.BRIDGE
             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.dependency_type = ifaceDependencyType.MASTER_SLAVE
         return self.parse_port_list(ifaceobj.name,
diff --git a/ifupdown2/lib/addon.py b/ifupdown2/lib/addon.py
index 29b6921..4075a02 100644
--- a/ifupdown2/lib/addon.py
+++ b/ifupdown2/lib/addon.py
@@ -80,3 +80,11 @@ class Addon(Netlink, Cache):
                     for user_attr, user_value in ifaceobj.config.items()
                 ]
             )
+
+
+class Bridge(Addon):
+
+    bridge_vlan_aware_list = []
+
+    def __init__(self):
+        super(Bridge, self).__init__()