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: batman_adv: improve readability

Browse Source 
Signed-off-by: Markus Hauschild <markus@moepman.eu>
This commit is contained in:
Markus Hauschild
2020-11-17 15:38:19 +01:00
parent 9436b6cb7a
commit 1dc2c4a7c2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ifupdown2/addons/batman_adv.py
View File

@@ -92,13 +92,11 @@ class batman_adv(Addon, moduleBase):
raise moduleNotSupported('module init failed: no /usr/sbin/batctl found')
for longname, entry in self._modinfo['attrs'].items():
if entry.get('batman-attr', False) == False:
continue
attr = longname.replace("batman-", "")
self._batman_attrs[attr] = {
'filename': attr.replace("-", "_"),
}
if entry.get('batman-attr', False):
attr = longname.replace("batman-", "")
self._batman_attrs[attr] = {
'filename': attr.replace("-", "_"),
}
def _is_batman_device(self, ifaceobj):
if ifaceobj.get_attr_value_first('batman-ifaces'):
@@ -174,7 +172,7 @@ class batman_adv(Addon, moduleBase):
try:
self.logger.debug("Running batctl ra %s" % routing_algo)
batctl_output = subprocess.check_output(["batctl", "ra", routing_algo], stderr=subprocess.STDOUT)
subprocess.check_output(["batctl", "ra", routing_algo], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as c:
raise Exception("Command \"batctl ra %s\" failed: %s" % (routing_algo, c.output))
except Exception as e:
@@ -206,7 +204,7 @@ class batman_adv(Addon, moduleBase):
return [None]
def _up(self, ifaceobj):
if self._get_batman_ifaces(ifaceobj) == None:
if self._get_batman_ifaces(ifaceobj) is None:
raise Exception('could not determine batman interfacaes')
# Verify existance of batman interfaces (should be present already)
@@ -353,7 +351,7 @@ class batman_adv(Addon, moduleBase):
if not op_handler:
return
if (operation != 'query-running' and not self._is_batman_device(ifaceobj)):
if operation != 'query-running' and not self._is_batman_device(ifaceobj):
return
if operation == 'query-checkcurr':