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

addons: vrf: avoids ifupdown2 error when VRF defined but not used

Browse Source 
Ticket: CM-9596
Reviewed By: Roopa Prabhu
Testing Done: Yes, by installing ifupdown2 deb onto cel-e1031-01

This patch makes sure ifupdown2 will not report a NoneType error
when VRF is defined but not used
This commit is contained in:
Nikhil
2016-03-14 16:45:12 -07:00
parent 428206bfb7
commit 8b43d01d67
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addons/bridge.py
View File

@@ -6,6 +6,7 @@
from sets import Set
from ifupdown.iface import *
import ifupdown.policymanager as policymanager
from ifupdownaddons.modulebase import moduleBase
from ifupdownaddons.bridgeutils import brctl
from ifupdownaddons.iproute2 import iproute2
@@ -211,6 +212,12 @@ class bridge(moduleBase):
self._resv_vlan_range = self._get_reserved_vlan_range()
self.logger.debug('%s: using reserved vlan range %s'
%(self.__class__.__name__, str(self._resv_vlan_range)))
default_stp_attr = policymanager.policymanager_api.get_attr_default(
module_name=self.__class__.__name__, attr='bridge-stp')
if (default_stp_attr and (default_stp_attr == 'on' or default_stp_attr == 'yes')):
self.default_stp_on = True
else:
self.default_stp_on = False
def _is_bridge(self, ifaceobj):
if ifaceobj.get_attr_value_first('bridge-ports'):
@@ -584,6 +591,8 @@ class bridge(moduleBase):
""" Returns true if user specified stp state is on, else False """
stp_attr = ifaceobj.get_attr_value_first('bridge-stp')
if not stp_attr:
return self.default_stp_on
if (stp_attr and (stp_attr == 'on' or stp_attr == 'yes')):
return True
return False