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

addons may implement syntax_check method to perform specific syntax checks

Browse Source 
and validation

Ticket: CM-8101
Reviewed By: Roopa
Testing Done:

The goal of this commit is to provide the addons a new way to perform their
own specific syntax checks. By implementing `syntax_check` method.

The addons will have to make sure the provided ifaceobj is valid.
e.g. vxlan.py:syntax_check(ifaceobj) should check:
self._is_vxlan_device(ifaceobj)

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-07-12 16:31:29 +01:00
parent 6080ea9f9c
commit eb377c6ca2
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ifupdown/ifupdownmain.py
View File

@@ -720,6 +720,16 @@ class ifupdownMain(ifupdownBase):
ifaceobj.flags |= ifaceobj.OLDEST_SIBLING
self.ifaceobjdict[ifaceobj.name].append(ifaceobj)
def _module_syntax_check(self, filtered_ifacenames):
for ifacename in filtered_ifacenames:
for module in self.modules.values():
try:
if hasattr(module, 'syntax_check') \
and callable(module.syntax_check):
module.syntax_check(self.get_ifaceobjs(ifacename))
except Exception, e:
pass #self.logger.warn('%s: %s' % (ifacename, str(e)))
def _iface_configattr_syntax_checker(self, attrname, attrval):
for m, mdict in self.module_attrs.items():
if not mdict:
@@ -1134,6 +1144,7 @@ class ifupdownMain(ifupdownBase):
# return here because we want to make sure most
# errors above are caught and reported.
if syntaxcheck:
self._module_syntax_check(filtered_ifacenames)
if not iface_read_ret:
raise Exception()
elif self._any_iface_errors(filtered_ifacenames):
@@ -1339,6 +1350,7 @@ class ifupdownMain(ifupdownBase):
# return here because we want to make sure most
# errors above are caught and reported.
if syntaxcheck:
self._module_syntax_check(interfaces_to_up)
if not iface_read_ret:
raise Exception()
elif self._any_iface_errors(interfaces_to_up):
@@ -1421,6 +1433,7 @@ class ifupdownMain(ifupdownBase):
# return here because we want to make sure most
# errors above are caught and reported.
if syntaxcheck:
self._module_syntax_check(new_filtered_ifacenames)
if not iface_read_ret:
raise Exception()
elif self._any_iface_errors(new_filtered_ifacenames):