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

remove dhclient -nw option + cleanup

Browse Source 
Ticket: CM-1438
Reviewed By:
Testing Done:
This commit is contained in:
roopa
2014-02-19 21:30:55 -08:00
parent 69f582783b
commit fe0a57d355
6 changed files with 55 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/networkinterfaces.py
View File

@ -39,10 +39,8 @@ class networkInterfaces():
def ignore_line(self, line):
l = line.strip('\n ')
if len(l) == 0 or l[0] == '#':
if not l or l[0] == '#':
return 1
return 0
def process_allow(self, lines, cur_idx, lineno):
@ -166,7 +164,7 @@ class networkInterfaces():
classes = ifaceobj.set_classes(
self.get_allow_classes_for_iface(ifaceobj.get_name()))
if classes is not None and len(classes) > 0:
if classes:
for c in classes:
ifaceobj.set_class(c)
@ -247,7 +245,7 @@ class networkInterfaces():
def read_file(self, filename=None):
ifaces_file = filename
if ifaces_file == None:
if not ifaces_file:
ifaces_file=self.ifaces_file
self.logger.debug('reading interfaces file %s' %ifaces_file)
@ -260,9 +258,7 @@ class networkInterfaces():
# run through template engine
filedata = self.run_template_engine(filedata)
self.process_filedata(filedata)
def load(self, filename=None):
return self.read_file(filename)