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

more fixes + cleanup + support for --exclude argument

Browse Source 
Ticket: CM-1438
Reviewed By:
Testing Done:
This commit is contained in:
roopa
2013-11-13 16:07:15 -08:00
parent eab25b7c62
commit 3e8ee54f30
15 changed files with 161 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/scheduler.py
View File

@@ -1,4 +1,11 @@
#!/usr/bin/python
#
# Copyright 2013. Cumulus Networks, Inc.
# Author: Roopa Prabhu, roopa@cumulusnetworks.com
#
# ifaceScheduler --
# interface scheduler
#
import os
import re
@@ -23,9 +30,10 @@ class ifaceScheduler(ifupdownBase):
or dependency graph format.
"""
def __init__(self):
def __init__(self, force=False):
self.logger = logging.getLogger('ifupdown.' +
self.__class__.__name__)
self.FORCE = force
def run_iface_subop(self, ifupdownobj, ifaceobj, op, subop, mdict, cenv):
""" Runs sub operation on an interface """
@@ -55,10 +63,7 @@ class ifaceScheduler(ifupdownBase):
self.exec_command(m, cmdenv=cenv)
except Exception, e:
err = 1
if ifupdownobj.ignore_error(str(e)) == True:
pass
else:
raise
self.log_error(str(e))
finally:
if op != 'query':
if err == 1:
@@ -123,11 +128,7 @@ class ifaceScheduler(ifupdownBase):
try:
self.run_iface(ifupdownobj, ifacename, operation)
except Exception, e:
if (ifupdownobj.ignore_error(str(e)) == True):
pass
else:
raise
self.log_error(str(e))
def run_iface_list_subop(self, ifupdownobj, ifacenames, op, subop, mdict,
sorted_by_dependency=False):
@@ -164,11 +165,7 @@ class ifaceScheduler(ifupdownBase):
self.run_iface_subop(ifupdownobj, ifaceobj, op, subop,
mdict, cenv)
except Exception, e:
if (ifupdownobj.ignore_error(str(e)) == True):
pass
else:
raise
self.log_error(str(e))
def run_iface_list_stages(self, ifupdownobj, ifacenames, op,
sorted_by_dependency=False):
@@ -261,7 +258,7 @@ class ifaceScheduler(ifupdownBase):
dlist, op)
self.accquire_token(ifacename)
except Exception, e:
if (ifupdownobj.ignore_error(str(e)) == True):
if (self.ignore_error(str(e)) == True):
pass
else:
# Dont bring the iface up if children did not come up