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

batman_adv: Rename _sysfs_mgmt_member_if() to _batctl_if() and use absolute path to batctl.

Browse Source 
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
This commit is contained in:
Maximilian Wilhelm
2016-11-17 18:51:05 +01:00
committed by Julien Fortin
parent f08f4d8a8a
commit a8c175f91f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
addons/batman_adv.py
View File

@@ -85,12 +85,13 @@ class batman_adv (moduleBase):
raise Exception ("Hop penalty not an integer value!") raise Exception ("Hop penalty not an integer value!")
def _sysfs_mgmt_member_if (self, bat_iface, mesh_iface, op): def _batctl_if (self, bat_iface, mesh_iface, op):
if op not in [ 'add', 'del' ]: if op not in [ 'add', 'del' ]:
raise Exception ("_sysfs_mgmt_member_if() called with invalid \"op\" value: %s" % op) raise Exception ("_batctl_if() called with invalid \"op\" value: %s" % op)
try: try:
batctl_output = subprocess.check_output (["batctl", "-m", bat_iface, "if", op, mesh_iface], stderr = subprocess.STDOUT) self.logger.debug ("Running batctl -m %s if %s %s" % (bat_iface, op, mesh_iface))
batctl_output = subprocess.check_output (["/usr/sbin/batctl", "-m", bat_iface, "if", op, mesh_iface], stderr = subprocess.STDOUT)
except subprocess.CalledProcessError as c: except subprocess.CalledProcessError as c:
raise Exception ("Command \"batctl -m %s if %s %s\" failed: %s" % (bat_iface, op, mesh_iface, c.output)) raise Exception ("Command \"batctl -m %s if %s %s\" failed: %s" % (bat_iface, op, mesh_iface, c.output))
except Exception as e: except Exception as e:
@@ -100,7 +101,7 @@ class batman_adv (moduleBase):
def _find_member_ifaces (self, ifaceobj, ignore = True): def _find_member_ifaces (self, ifaceobj, ignore = True):
members = [] members = []
iface_ignore_re = self._get_batman_ifaces_ignore_regex (ifaceobj) iface_ignore_re = self._get_batman_ifaces_ignore_regex (ifaceobj)
batctl_fh = subprocess.Popen (["batctl", "-m", ifaceobj.name, "if"], bufsize = 4194304, stdout = subprocess.PIPE).stdout batctl_fh = subprocess.Popen (["/usr/sbin/batctl", "-m", ifaceobj.name, "if"], bufsize = 4194304, stdout = subprocess.PIPE).stdout
for line in batctl_fh.readlines (): for line in batctl_fh.readlines ():
iface = line.split (':')[0] iface = line.split (':')[0]
if iface_ignore_re and iface_ignore_re.match (iface) and ignore: if iface_ignore_re and iface_ignore_re.match (iface) and ignore:
@@ -140,13 +141,15 @@ class batman_adv (moduleBase):
members = self._find_member_ifaces (ifaceobj) members = self._find_member_ifaces (ifaceobj)
for iface in members: for iface in members:
if iface not in batman_ifaces: if iface not in batman_ifaces:
self._sysfs_mgmt_member_if (ifaceobj.name, iface, 'del') self._batctl_if (ifaceobj.name, iface, 'del')
for iface in batman_ifaces: for iface in batman_ifaces:
if iface not in members: if iface not in members:
self._sysfs_mgmt_member_if (ifaceobj.name, iface, 'add') self._batctl_if (ifaceobj.name, iface, 'add')
# Batman interfaces no present, add member interfaces to create it
else: else:
for iface in batman_ifaces: for iface in batman_ifaces:
self._sysfs_mgmt_member_if (ifaceobj.name, iface, 'add') self._batctl_if (ifaceobj.name, iface, 'add')
# Check/set Hop Penalty # Check/set Hop Penalty
hop_penalty_cfg = self._get_batman_hop_penalty (ifaceobj) hop_penalty_cfg = self._get_batman_hop_penalty (ifaceobj)
@@ -164,7 +167,7 @@ class batman_adv (moduleBase):
members = self._find_member_ifaces (ifaceobj) members = self._find_member_ifaces (ifaceobj)
for iface in members: for iface in members:
self._sysfs_mgmt_member_if (ifaceobj.name, iface, 'del') self._batctl_if (ifaceobj.name, iface, 'del')
# The main interface will automagically vanish after the last member # The main interface will automagically vanish after the last member
# interface has been deleted. # interface has been deleted.