Ido Barkan has uploaded a new change for review. Change subject: net: consolidate bondings.py naming ......................................................................
net: consolidate bondings.py naming This is only a partial change. More cleanup needs to be done soon after I1f4c16b1523822a2d53d4525841ff8741af6296c will be merged. Parameters are now called the same. In addition function names became relative to the module (e.g. bondinfo->info). Naming clashes were made explicit in vlans.py, virt.sampling.py and netinfo.__initi__.py Change-Id: Ia2f4c5b8037e30efa504d1fa416ae96d9c271fbf Signed-off-by: Ido Barkan <[email protected]> --- M lib/vdsm/netinfo/__init__.py M lib/vdsm/netinfo/bonding.py M lib/vdsm/netinfo/vlans.py M vdsm/virt/sampling.py 4 files changed, 30 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/49626/1 diff --git a/lib/vdsm/netinfo/__init__.py b/lib/vdsm/netinfo/__init__.py index 5dca305..ce70518 100644 --- a/lib/vdsm/netinfo/__init__.py +++ b/lib/vdsm/netinfo/__init__.py @@ -32,13 +32,13 @@ from ..netlink import link as nl_link from .addresses import getIpAddrs, getIpInfo -from .bonding import permanent_address, bondinfo, bondOptsCompat +from . import bonding from .bridges import bridgeinfo, ports, bridge_stp_state from .dhcp import (get_dhclient_ifaces, propose_updates_to_reported_dhcp, update_reported_dhcp, dhcp_used) from .misc import getIfaceCfg from .mtus import getMtu -from .nics import info +from . import nics from .routes import get_routes, get_gateway from .qos import report_network_qos from .vlans import vlaninfo, vlan_id, vlan_device @@ -55,7 +55,7 @@ def get(vdsmnets=None): networking = {'bondings': {}, 'bridges': {}, 'networks': {}, 'nics': {}, 'vlans': {}} - paddr = permanent_address() + paddr = bonding.permanent_address() ipaddrs = getIpAddrs() dhcpv4_ifaces, dhcpv6_ifaces = get_dhclient_ifaces() routes = get_routes() @@ -73,9 +73,9 @@ if dev.isBRIDGE(): devinfo = networking['bridges'][dev.name] = bridgeinfo(dev) elif dev.isNICLike(): - devinfo = networking['nics'][dev.name] = info(dev, paddr) + devinfo = networking['nics'][dev.name] = nics.info(dev, paddr) elif dev.isBOND(): - devinfo = networking['bondings'][dev.name] = bondinfo(dev) + devinfo = networking['bondings'][dev.name] = bonding.info(dev) elif dev.isVLAN(): devinfo = networking['vlans'][dev.name] = vlaninfo(dev) else: @@ -83,7 +83,7 @@ devinfo.update(_devinfo(dev, routes, ipaddrs, dhcpv4_ifaces, dhcpv6_ifaces)) if dev.isBOND(): - bondOptsCompat(devinfo) + bonding.bondOptsCompat(devinfo) for network_name, network_info in six.iteritems(networking['networks']): if network_info['bridged']: diff --git a/lib/vdsm/netinfo/bonding.py b/lib/vdsm/netinfo/bonding.py index fde2fe6..98280b5 100644 --- a/lib/vdsm/netinfo/bonding.py +++ b/lib/vdsm/netinfo/bonding.py @@ -29,7 +29,7 @@ from ..ipwrapper import Link from .misc import _visible_devs -from .nics import speed +from . import nics BONDING_ACTIVE_SLAVE = '/sys/class/net/%s/bonding/active_slave' BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' @@ -58,32 +58,32 @@ bondings = partial(_visible_devs, Link.isBOND) -def slaves(bonding): - with open(BONDING_SLAVES % bonding) as f: +def slaves(bond_name): + with open(BONDING_SLAVES % bond_name) as f: return f.readline().split() -def bondinfo(link): +def info(link): return {'hwaddr': link.address, 'slaves': slaves(link.name), 'active_slave': _active_slave(link.name), 'opts': _getBondingOptions(link.name)} -def _active_slave(bonding): +def _active_slave(bond_name): """ - :param bonding: + :param bond_name: :return: active slave when one exists or '' otherwise """ - with open(BONDING_ACTIVE_SLAVE % bonding) as f: + with open(BONDING_ACTIVE_SLAVE % bond_name) as f: return f.readline().rstrip() -def _getBondingOptions(bond): +def _getBondingOptions(bond_name): """ Return non-empty options differing from defaults, excluding not actual or not applicable options, e.g. 'ad_num_ports' or 'slaves'. """ - opts = bondOpts(bond) + opts = bondOpts(bond_name) mode = opts['mode'][-1] if 'mode' in opts else None defaults = getDefaultBondingOptions(mode) @@ -91,12 +91,12 @@ if val and val != defaults.get(opt))) -def bondOpts(bond, keys=None): +def bondOpts(bond_name, keys=None): """ Return a dictionary in the same format as _bondOpts(). Exclude entries that are not bonding options, e.g. 'ad_num_ports' or 'slaves'. """ - return dict(((opt, val) for (opt, val) in _bondOpts(bond, keys).iteritems() + return dict(((opt, val) for (opt, val) in _bondOpts(bond_name, keys).iteritems() if opt not in EXCLUDED_BONDING_ENTRIES)) @@ -114,14 +114,14 @@ return defaults[mode] -def _bondOpts(bond, keys=None): +def _bondOpts(bond_name, keys=None): """ Returns a dictionary of bond option name and a values iterable. E.g., {'mode': ('balance-rr', '0'), 'xmit_hash_policy': ('layer2', '0')} """ if keys is None: - paths = iglob(BONDING_OPT % (bond, '*')) + paths = iglob(BONDING_OPT % (bond_name, '*')) else: - paths = (BONDING_OPT % (bond, key) for key in keys) + paths = (BONDING_OPT % (bond_name, key) for key in keys) opts = {} for path in paths: with open(path) as optFile: @@ -140,19 +140,19 @@ return json.loads(defaults.read()) -def bondSpeed(bondName): +def speed(bond_name): """Returns the bond speed if bondName refers to a bond, 0 otherwise.""" - opts = _bondOpts(bondName, keys=['slaves', 'active_slave', 'mode']) + opts = _bondOpts(bond_name, keys=['slaves', 'active_slave', 'mode']) try: if opts['slaves']: if opts['mode'][1] in BONDING_FAILOVER_MODES: active_slave = opts['active_slave'] - s = speed(active_slave[0]) if active_slave else 0 + s = nics.speed(active_slave[0]) if active_slave else 0 elif opts['mode'][1] in BONDING_LOADBALANCE_MODES: - s = sum(speed(slave) for slave in opts['slaves']) + s = sum(nics.speed(slave) for slave in opts['slaves']) return s except Exception: - logging.exception('cannot read %s speed', bondName) + logging.exception('cannot read %s speed', bond_name) return 0 diff --git a/lib/vdsm/netinfo/vlans.py b/lib/vdsm/netinfo/vlans.py index 9bb62f8..3b9142b 100644 --- a/lib/vdsm/netinfo/vlans.py +++ b/lib/vdsm/netinfo/vlans.py @@ -19,9 +19,9 @@ from __future__ import absolute_import from functools import partial -from .bonding import bondSpeed +from . import bonding from .misc import _visible_devs -from .nics import speed +from . import nics from ..ipwrapper import getLink, Link from ..netlink import link as nl_link @@ -60,9 +60,9 @@ vlanDevName = vlan_device(vlanName) vlanDev = getLink(vlanDevName) if vlanDev.isNIC(): - speed = speed(vlanDevName) + speed = nics.speed(vlanDevName) elif vlanDev.isBOND(): - speed = bondSpeed(vlanDevName) + speed = bonding.speed(vlanDevName) else: speed = 0 return speed diff --git a/vdsm/virt/sampling.py b/vdsm/virt/sampling.py index bcc7d71..16a161a 100644 --- a/vdsm/virt/sampling.py +++ b/vdsm/virt/sampling.py @@ -603,7 +603,7 @@ if dev.isNIC(): speed = nics.speed(dev.name) elif dev.isBOND(): - speed = bonding.bondSpeed(dev.name) + speed = bonding.speed(dev.name) elif dev.isVLAN(): speed = vlans.vlanSpeed(dev.name) else: -- To view, visit https://gerrit.ovirt.org/49626 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2f4c5b8037e30efa504d1fa416ae96d9c271fbf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ido Barkan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
