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

A whole lot of fixes and some new code (needs some cleanup which will be

Browse Source 
part of subsequent checkins)

Ticket: CM-1438
Reviewed By:
Testing Done: Tested ifup, ifdown and ifquery

Conflicts:
	packages/ifupdown2-addons/addons/ifenslave.py
This commit is contained in:
roopa
2014-01-16 06:46:17 -08:00
parent f407f5cfe8
commit 739f665baa
9 changed files with 498 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/networkinterfaces.py
View File

@ -10,6 +10,7 @@
import collections
import logging
import glob
import re
from iface import *
class networkInterfaces():
@ -95,6 +96,7 @@ class networkInterfaces():
iface_line = lines[cur_idx].strip('\n ')
iface_attrs = iface_line.split()
ifacename = iface_attrs[1]
ifaceobj.raw_lines.append(iface_line)
@ -111,6 +113,9 @@ class networkInterfaces():
ifaceobj.raw_lines.append(l)
# preprocess vars (XXX: only preprocesses $IFACE for now)
l = re.sub(r'\$IFACE', ifacename, l)
attrs = l.split(' ', 1)
if len(attrs) < 2:
self.logger.warn('invalid syntax at line %d' %(line_idx + 1))
@ -124,7 +129,7 @@ class networkInterfaces():
lines_consumed = line_idx - cur_idx
# Create iface object
ifaceobj.set_name(iface_attrs[1])
ifaceobj.set_name(ifacename)
ifaceobj.set_config(iface_config)
ifaceobj.generate_env()
if len(iface_attrs) > 2: