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
CumulusNetworks-ifupdown2/ifupdownaddons/mstpctlutil.py

220 lines
8.5 KiB
Python
Raw Normal View History

Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
#!/usr/bin/python
#
# Copyright 2014 Cumulus Networks, Inc. All rights reserved.
# Author: Roopa Prabhu, roopa@cumulusnetworks.com
#
mstp: performances: now globaly caching "mstpctl showportdetail <bridgename> json" calls Ticket: CM-10273 Reviewed By: Roopa Testing Done: Smoke + test from the ticket
2016-04-29 21:21:45 +02:00
from cache import MSTPAttrsCache
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
from utilsbase import *
from ifupdown.iface import *
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
from ifupdown.utils import utils
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
from cache import *
import re
ifupdown not restoring mstpctl attributes (e.g. bpdufilter, bpduguard) in mstpctl Ticket: CM-7756 Reviewed By: roopa Testing Done: built powerpc and tested ifupdown2 as well as new tests Once mstpctl-portbpdufilter or mstpctl-bpduguard is enabled for an interface, removing the configuration in /etc/network/interfaces does not toggle the mstpctl state back to no. The root cause of this problem is that "ifreload" does not check default settings for MSTP configuration for bridge ports and use a default when that setting is removed from the configuration. This patch adds a check in the existing loop on attribute values. If there is no configured value, we check to see if a default exists. self._modinfo['attrs'][attrname]['default'] exists. If it exists and it is different then the currently running value we reset the attribute to its default. This is what a customer would expect if they removed a configured value. (also added test in cl-tests to check this functionality) (cherry picked from commit 63d0f7082d44fedabe002aebbb658751dc655a46)
2015-11-29 20:22:06 -05:00
import json
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
class mstpctlutil(utilsBase):
""" This class contains helper methods to interact with mstpd using
mstputils commands """
_cache_fill_done = False
_bridgeattrmap = {'bridgeid' : 'bridge-id',
'maxage' : 'max-age',
'fdelay' : 'forward-delay',
'txholdcount' : 'tx-hold-count',
'maxhops' : 'max-hops',
'ageing' : 'ageing-time',
'hello' : 'hello-time',
'forcevers' : 'force-protocol-version'}
_bridgeportattrmap = {'portadminedge' : 'admin-edge-port',
Checkin missing mstpctlutil.py changes for e1e1cf57295dee2ec0df4b1e61c6a7c4e6969402 Ticket: CM-4141 Reviewed By: Testing Done:
2014-11-09 13:54:33 -08:00
'portp2p' : 'admin-point-to-point',
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
'portrestrrole' : 'restricted-role',
'portrestrtcn' : 'restricted-TCN',
'bpduguard' : 'bpdu-guard-port',
'portautoedge' : 'auto-edge-port',
'portnetwork' : 'network-port',
'portbpdufilter' : 'bpdufilter-port'}
def __init__(self, *args, **kargs):
utilsBase.__init__(self, *args, **kargs)
def is_mstpd_running(self):
try:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_command('/bin/pidof mstpd')
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
except:
return False
else:
return True
def get_bridgeport_attr(self, bridgename, portname, attrname):
try:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
cmdl = ['/sbin/mstpctl', 'showportdetail', bridgename, portname,
self._bridgeportattrmap[attrname]]
return utils.exec_commandl(cmdl).strip('\n')
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
except Exception, e:
pass
return None
def get_bridgeport_attrs(self, bridgename, portname):
bridgeattrs = {}
try:
bridgeattrs = dict((k, self.get_bridgeport_attr(bridgename, v))
for k, v in self._bridgeattrmap.items())
bridgeattrs['treeprio'] = int(bridgeattrs.get('bridgeid',
'').split('.')[0], base=16) * 4096
except Exception, e:
ifupdownaddons: mstpctlutil: changing log level to catch subprocess exception.
2016-04-19 15:18:35 +02:00
self.logger.warn(str(e))
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
pass
return bridgeattrs
mstp: performances: now globaly caching "mstpctl showportdetail <bridgename> json" calls Ticket: CM-10273 Reviewed By: Roopa Testing Done: Smoke + test from the ticket
2016-04-29 21:21:45 +02:00
def _get_mstpctl_bridgeport_attr_from_cache(self, bridgename):
attrs = MSTPAttrsCache.get(bridgename)
if not attrs:
try:
cmd = ['/sbin/mstpctl', 'showportdetail', bridgename, 'json']
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
output = utils.exec_commandl(cmd)
mstp: performances: now globaly caching "mstpctl showportdetail <bridgename> json" calls Ticket: CM-10273 Reviewed By: Roopa Testing Done: Smoke + test from the ticket
2016-04-29 21:21:45 +02:00
if not output:
return None
except Exception as e:
self.logger.info(str(e))
return None
mstpctl_bridgeport_attrs_dict = {}
try:
mstpctl_bridge_cache = json.loads(output.strip('\n'))
for portname in mstpctl_bridge_cache.keys():
# we will ignore the portid for now and just index
# by bridgename, portname, and json attribute
for portid in mstpctl_bridge_cache[portname].keys():
mstpctl_bridgeport_attrs_dict[portname] = {}
for jsonAttr in mstpctl_bridge_cache[portname][portid].keys():
jsonVal = mstpctl_bridge_cache[portname][portid][jsonAttr]
mstpctl_bridgeport_attrs_dict[portname][jsonAttr] = str(jsonVal)
MSTPAttrsCache.set(bridgename, mstpctl_bridgeport_attrs_dict)
return mstpctl_bridgeport_attrs_dict
except Exception as e:
self.logger.info('%s: cannot fetch mstpctl bridge port attributes: %s', str(e))
return attrs
ifupdown not restoring mstpctl attributes (e.g. bpdufilter, bpduguard) in mstpctl Ticket: CM-7756 Reviewed By: roopa Testing Done: built powerpc and tested ifupdown2 as well as new tests Once mstpctl-portbpdufilter or mstpctl-bpduguard is enabled for an interface, removing the configuration in /etc/network/interfaces does not toggle the mstpctl state back to no. The root cause of this problem is that "ifreload" does not check default settings for MSTP configuration for bridge ports and use a default when that setting is removed from the configuration. This patch adds a check in the existing loop on attribute values. If there is no configured value, we check to see if a default exists. self._modinfo['attrs'][attrname]['default'] exists. If it exists and it is different then the currently running value we reset the attribute to its default. This is what a customer would expect if they removed a configured value. (also added test in cl-tests to check this functionality) (cherry picked from commit 63d0f7082d44fedabe002aebbb658751dc655a46)
2015-11-29 20:22:06 -05:00
mstp: performances: now globaly caching "mstpctl showportdetail <bridgename> json" calls Ticket: CM-10273 Reviewed By: Roopa Testing Done: Smoke + test from the ticket
2016-04-29 21:21:45 +02:00
def get_mstpctl_bridgeport_attr(self, bridgename, portname, attr):
attrs = self._get_mstpctl_bridgeport_attr_from_cache(bridgename)
if not attrs:
return 'no'
else:
val = attrs.get(portname,{}).get(attr, 'no')
if val == 'True':
val = 'yes'
return str(val)
ifupdown not restoring mstpctl attributes (e.g. bpdufilter, bpduguard) in mstpctl Ticket: CM-7756 Reviewed By: roopa Testing Done: built powerpc and tested ifupdown2 as well as new tests Once mstpctl-portbpdufilter or mstpctl-bpduguard is enabled for an interface, removing the configuration in /etc/network/interfaces does not toggle the mstpctl state back to no. The root cause of this problem is that "ifreload" does not check default settings for MSTP configuration for bridge ports and use a default when that setting is removed from the configuration. This patch adds a check in the existing loop on attribute values. If there is no configured value, we check to see if a default exists. self._modinfo['attrs'][attrname]['default'] exists. If it exists and it is different then the currently running value we reset the attribute to its default. This is what a customer would expect if they removed a configured value. (also added test in cl-tests to check this functionality) (cherry picked from commit 63d0f7082d44fedabe002aebbb658751dc655a46)
2015-11-29 20:22:06 -05:00
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def set_bridgeport_attrs(self, bridgename, bridgeportname, attrdict,
check=True):
for k, v in attrdict.iteritems():
if not v:
continue
try:
addons: mstpctl: bpdu filter and bpdu guard enabled by default for vxlan device Ticket: CM-7678 Reviewed By: Roopa Prabhu Testing Done: yes, with vlan aware/unaware bridge on dell-s3000-02 This patch enables bpdu filter and bpdu guard enabled for vxland device under the bridge if these two attributes are unconfigured Signed-off-by: Nikhil <nikhil@cumulusnetworks.com>
2016-05-05 22:09:49 -07:00
self.set_bridgeport_attr(bridgename, bridgeportname,
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
k, v, check)
except Exception, e:
self.logger.warn(str(e))
def set_bridgeport_attr(self, bridgename, bridgeportname, attrname,
attrvalue, check=True):
if check:
attrvalue_curr = self.get_bridgeport_attr(bridgename,
bridgeportname, attrname)
if attrvalue_curr and attrvalue_curr == attrvalue:
return
if attrname == 'treeportcost' or attrname == 'treeportprio':
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_commandl(['/sbin/mstpctl', 'set%s' % attrname,
'%s' % bridgename, '%s' % bridgeportname, '0',
'%s' % attrvalue])
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
else:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_commandl(['/sbin/mstpctl', 'set%s' % attrname,
'%s' % bridgename, '%s' % bridgeportname,
'%s' % attrvalue])
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def get_bridge_attrs(self, bridgename):
bridgeattrs = {}
try:
bridgeattrs = dict((k, self.get_bridge_attr(bridgename, k))
for k in self._bridgeattrmap.keys())
bridgeattrs['treeprio'] = '%d' %(int(bridgeattrs.get('bridgeid',
'').split('.')[0], base=16) * 4096)
del bridgeattrs['bridgeid']
except Exception, e:
Checkin missing mstpctlutil.py changes for e1e1cf57295dee2ec0df4b1e61c6a7c4e6969402 Ticket: CM-4141 Reviewed By: Testing Done:
2014-11-09 13:54:33 -08:00
self.logger.debug(bridgeattrs)
self.logger.debug(str(e))
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
pass
return bridgeattrs
def get_bridge_attr(self, bridgename, attrname):
try:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
cmdl = ['/sbin/mstpctl', 'showbridge', bridgename,
self._bridgeattrmap[attrname]]
return utils.exec_commandl(cmdl).strip('\n')
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
except Exception, e:
pass
return None
def set_bridge_attr(self, bridgename, attrname, attrvalue, check=True):
if check:
attrvalue_curr = self.get_bridge_attr(bridgename, attrname)
if attrvalue_curr and attrvalue_curr == attrvalue:
return
if attrname == 'treeprio':
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_commandl(['/sbin/mstpctl', 'set%s' % attrname,
'%s' % bridgename, '0', '%s' % attrvalue],
stdout=False, stderr=None)
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
else:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_commandl(['/sbin/mstpctl', 'set%s' % attrname,
'%s' % bridgename, '%s' % attrvalue],
stdout=False, stderr=None)
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def set_bridge_attrs(self, bridgename, attrdict, check=True):
for k, v in attrdict.iteritems():
if not v:
continue
try:
self.set_bridge_attr(bridgename, k, v, check)
except Exception, e:
self.logger.warn('%s: %s' %(bridgename, str(e)))
pass
def get_bridge_treeprio(self, bridgename):
try:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
cmdl = ['/sbin/mstpctl',
'showbridge',
bridgename,
self._bridgeattrmap['bridgeid']]
bridgeid = utils.exec_commandl(cmdl).strip('\n')
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
return '%d' %(int(bridgeid.split('.')[0], base=16) * 4096)
except:
pass
return None
def set_bridge_treeprio(self, bridgename, attrvalue, check=True):
if check:
attrvalue_curr = self.get_bridge_treeprio(bridgename)
if attrvalue_curr and attrvalue_curr == attrvalue:
return
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_commandl(['/sbin/mstpctl', 'settreeprio', bridgename, '0',
str(attrvalue)])
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def showbridge(self, bridgename=None):
if bridgename:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
return utils.exec_command('/sbin/mstpctl showbridge %s' % bridgename)
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
else:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
return utils.exec_command('/sbin/mstpctl showbridge')
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def showportdetail(self, bridgename):
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
return utils.exec_command('/sbin/mstpctl showportdetail %s' % bridgename)
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
def mstpbridge_exists(self, bridgename):
try:
performance fix: better handling fd to allow subprocess.close_fds=False and code re-organisation Ticket: None Reviewed By: CCR-4692 Testing Done: smoke + scale tests If called with close_fds=True the subprocess module will try to close every fd from 3 to MAXFD before executing the specified command. This is done in Python not even with a C-implementation which truly affecting performances. This patch aims to better handle the file descriptor used by ifupdown2. Either by closing them after use or by setting the close-on-exec flag for the file descriptor, which causes the file descriptor to be automatically (and atomically) closed when any of the exec-family functions succeed. With the actual patch all tests are passing, I can't think of any future issue but if any a possible future modification might be to use the parameter 'preexec_fn', which allows us to set function which will be executed in the child process before executing the command line. We can always manually close any remaining open file descriptors with something like: >>> os.listdir('/proc/self/fd/') ['0', '1', '2', ‘3’, etc..] >>> for fd in os.listdir('/proc/self/fd/') >>> if int(fd) > 2: >>> os.close(fd) This patch is also totally re-organising the use of subprocesses. By removing all subprocess code redundancy.
2016-05-13 19:52:57 +02:00
utils.exec_command('mstpctl showbridge %s' % bridgename, stdout=False)
Move ifupdown2addons into ifupdown2 pacakge Ticket: CM-3864 Reviewed By: Testing Done: Tested build and install open item: - cleanup stale ifupdown2-addons package files
2014-10-09 16:02:46 -07:00
return True
except:
return False
Copy Permalink