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

Fix statemanager update flag condition + some debug print cleanup

Browse Source 
Ticket: CM-1438
Reviewed By:
Testing Done: ifupdown2 sanity
This commit is contained in:
roopa
2014-04-01 15:21:51 -07:00
parent cb7cc59218
commit 7538dc77f5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/ifupdownmain.py
View File

@@ -481,9 +481,8 @@ class ifupdownMain(ifupdownBase):
self.logger.debug('scheduling \'%s\' for %s' self.logger.debug('scheduling \'%s\' for %s'
%(str(ops), str(ifacenames))) %(str(ops), str(ifacenames)))
self.logger.debug('dependency graph:') self._pretty_print_ordered_dict('dependency graph',
self._pretty_print_ordered_dict(self.dependency_graph) self.dependency_graph)
return ifaceScheduler.sched_ifaces(self, ifacenames, ops, return ifaceScheduler.sched_ifaces(self, ifacenames, ops,
dependency_graph=self.dependency_graph, dependency_graph=self.dependency_graph,
order=ifaceSchedulerFlags.INORDER order=ifaceSchedulerFlags.INORDER
@@ -579,7 +578,7 @@ class ifupdownMain(ifupdownBase):
excludepats=None, printdependency=None, syntaxcheck=False): excludepats=None, printdependency=None, syntaxcheck=False):
""" up an interface """ """ up an interface """
if self.ADDONS_ENABLE: self.STATEMANAGER_UPDATE = False if not self.ADDONS_ENABLE: self.STATEMANAGER_UPDATE = False
if auto: if auto:
self.ALL = True self.ALL = True
self.WITH_DEPENDS = True self.WITH_DEPENDS = True
@@ -626,7 +625,7 @@ class ifupdownMain(ifupdownBase):
excludepats=None, printdependency=None, usecurrentconfig=False): excludepats=None, printdependency=None, usecurrentconfig=False):
""" down an interface """ """ down an interface """
if self.ADDONS_ENABLE: self.STATEMANAGER_UPDATE = False if not self.ADDONS_ENABLE: self.STATEMANAGER_UPDATE = False
if auto: if auto:
self.ALL = True self.ALL = True
self.WITH_DEPENDS = True self.WITH_DEPENDS = True
@@ -835,9 +834,11 @@ class ifupdownMain(ifupdownBase):
return return
self._save_state() self._save_state()
def _pretty_print_ordered_dict(self, argdict): def _pretty_print_ordered_dict(self, prefix, argdict):
outbuf = prefix + ' {'
for k, vlist in argdict.items(): for k, vlist in argdict.items():
self.logger.debug('%s : %s' %(k, str(vlist))) outbuf += '%s : %s\n' %(k, str(vlist))
self.logger.debug(outbuf + '}')
def print_dependency(self, ifacenames, format): def print_dependency(self, ifacenames, format):
""" prints iface dependency information """ """ prints iface dependency information """