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

ifupdown2: syntax-check: exit with 1 if syntax errors

Browse Source 
Ticket: CM-7995
Reviewed By: CCR-3850
Testing Done: Tested exit code on syntax errors

This patch adds members 'errors' and 'warns' to networkinterfaces.py
to track errors and warns during parsing interfaces file.

This patch also adds --syntax-check option to ifreload
given people seem to use ifreload more than ifup these days.

$ ifreload --syntax-check -a
error: /etc/network/interfaces: iface swp1.200: unsupported keyword (roopa-attr)
$ echo $?
1

(cherry picked from commit e643a136fcf5d387ff0f9a31cb6a6af4983e1012)
This commit is contained in:
Roopa Prabhu
2015-11-22 16:26:14 -08:00
committed by Sam Tannous
parent ff28a49e7d
commit cfa06db648
5 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ifupdown/networkinterfaces.py
View File

@@ -64,6 +64,9 @@ class networkInterfaces():
self._currentfile_has_template = False
self._ws_split_regex = re.compile(r'[\s\t]\s*')
self.errors = 0
self.warns = 0
@property
def _currentfile(self):
try:
@@ -76,12 +79,14 @@ class networkInterfaces():
self.logger.error('%s: %s' %(filename, msg))
else:
self.logger.error('%s: line%d: %s' %(filename, lineno, msg))
self.errors += 1
def _parse_warn(self, filename, lineno, msg):
if lineno == -1 or self._currentfile_has_template:
self.logger.warn('%s: %s' %(filename, msg))
else:
self.logger.warn('%s: line%d: %s' %(filename, lineno, msg))
self.warns += 1
def _validate_addr_family(self, ifaceobj, lineno=-1):
if ifaceobj.addr_family:
@@ -421,12 +426,15 @@ class networkInterfaces():
if not isinstance(ifacedicts,list):
ifacedicts = [ifacedicts]
errors = 0
for ifacedict in ifacedicts:
ifaceobj = ifaceJsonDecoder.json_to_ifaceobj(ifacedict)
if ifaceobj:
self._validate_addr_family(ifaceobj)
self.callbacks.get('validateifaceobj')(ifaceobj)
if not self.callbacks.get('validateifaceobj')(ifaceobj):
errors += 1
self.callbacks.get('iface_found')(ifaceobj)
self.errors += errors
def load(self):
""" This member function loads the networkinterfaces file.
@@ -437,6 +445,7 @@ class networkInterfaces():
if not self.interfacesfile and not self.interfacesfileiobuf:
self.logger.warn('no terminal line stdin used or ')
self.logger.warn('no network interfaces file defined.')
self.warns += 1
return
if self.interfacesfileformat == 'json':