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

Move link_master_slave flag overrides to /sbin/ifupdown + log a msg to

Browse Source 
indicate link_master_slave flag status

Ticket:
Reviewed By:
Testing Done: ifupdown2 sanity tests with link_master_slave feature on/off
This commit is contained in:
Roopa Prabhu
2014-12-29 22:07:49 -08:00
parent fff589ea4c
commit cebe79c93a
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ifupdown/ifupdownmain.py
View File

@@ -230,11 +230,16 @@ class ifupdownMain(ifupdownBase):
self._delay_admin_state = True if self.config.get(
'delay_admin_state_change', '0') == '1' else False
self._delay_admin_state_iface_queue = []
if not self._delay_admin_state:
self._link_master_slave = True if self.config.get(
if self._delay_admin_state:
self.logger.info('\'delay_admin_state_change\' is set. admin ' +
'state changes will be delayed till the end.')
self._link_master_slave = True if self.config.get(
'link_master_slave', '0') == '1' else False
else:
self._link_master_slave = False
if self._link_master_slave:
self.logger.info('\'link_master_slave\' is set. slave admin ' +
'state changes will be delayed till the ' +
'masters admin state change.')
def link_master_slave_ignore_error(self, errorstr):
# If link master slave flag is set,
@@ -833,8 +838,6 @@ class ifupdownMain(ifupdownBase):
if auto:
self.ALL = True
self.WITH_DEPENDS = True
else:
self._link_master_slave = False
try:
self.read_iface_config()
except Exception:
@@ -885,8 +888,6 @@ class ifupdownMain(ifupdownBase):
if auto:
self.ALL = True
self.WITH_DEPENDS = True
else:
self._link_master_slave = False
# For down we need to look at old state, unless usecurrentconfig
# is set
if (not usecurrentconfig and self.STATEMANAGER_ENABLE and
@@ -1016,8 +1017,6 @@ class ifupdownMain(ifupdownBase):
if auto:
self.ALL = True
self.WITH_DEPENDS = True
else:
self._link_master_slave = False
try:
self.read_iface_config()
except:
@@ -1091,8 +1090,6 @@ class ifupdownMain(ifupdownBase):
if auto:
self.ALL = True
self.WITH_DEPENDS = True
else:
self._link_master_slave = False
try:
self.read_iface_config()
except: