Ondřej Svoboda has uploaded a new change for review.
Change subject: netinfo: Move _devinfo out of _*info to avoid passing more
parameters
......................................................................
netinfo: Move _devinfo out of _*info to avoid passing more parameters
Change-Id: I0b59b9539ee759d06f44e51cf8bbddca52450ac5
Signed-off-by: Ondřej Svoboda <osvob...@redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 21 insertions(+), 25 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/00/28700/1
diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index be6d8fb..87967b8 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -640,30 +640,25 @@
in sorted(opts.iteritems())))
-def _bridgeinfo(link, gateways, ipv6routes, ipaddrs):
- info = _devinfo(link, ipaddrs)
- info.update({'gateway': getgateway(gateways, link.name),
- 'ipv6gateway': ipv6routes.get(link.name, '::'),
- 'ports': ports(link.name),
- 'stp': bridge_stp_state(link.name),
- 'opts': bridgeOpts(link.name)})
- return info
+def _bridgeinfo(link, gateways, ipv6routes):
+ return {'gateway': getgateway(gateways, link.name),
+ 'ipv6gateway': ipv6routes.get(link.name, '::'),
+ 'ports': ports(link.name),
+ 'stp': bridge_stp_state(link.name),
+ 'opts': bridgeOpts(link.name)}
-def _nicinfo(link, paddr, ipaddrs):
- info = _devinfo(link, ipaddrs)
- info.update({'hwaddr': link.address, 'speed': nicSpeed(link.name)})
+def _nicinfo(link, paddr):
+ info = {'hwaddr': link.address, 'speed': nicSpeed(link.name)}
if paddr.get(link.name):
info['permhwaddr'] = paddr[link.name]
return info
-def _bondinfo(link, ipaddrs):
- info = _devinfo(link, ipaddrs)
+def _bondinfo(link):
opts = getBondingOptions(link.name)
-
- info.update({'hwaddr': link.address, 'slaves': slaves(link.name),
- 'options': opts})
+ info = {'hwaddr': link.address, 'slaves': slaves(link.name),
+ 'options': opts}
# Replace or empty legacy ifcfg options
if opts:
@@ -674,10 +669,8 @@
return info
-def _vlaninfo(link, ipaddrs):
- info = _devinfo(link, ipaddrs)
- info.update({'iface': link.device, 'vlanid': link.vlanid})
- return info
+def _vlaninfo(link):
+ return {'iface': link.device, 'vlanid': link.vlanid}
def _devinfo(link, ipaddrs):
@@ -819,14 +812,17 @@
for dev in (link for link in getLinks() if not link.isHidden()):
if dev.isBRIDGE():
- d['bridges'][dev.name] = \
- _bridgeinfo(dev, gateways, ipv6routes, ipaddrs)
+ info = d['bridges'][dev.name] = _bridgeinfo(dev, gateways,
+ ipv6routes)
elif dev.isNICLike():
- d['nics'][dev.name] = _nicinfo(dev, paddr, ipaddrs)
+ info = d['nics'][dev.name] = _nicinfo(dev, paddr)
elif dev.isBOND():
- d['bondings'][dev.name] = _bondinfo(dev, ipaddrs)
+ info = d['bondings'][dev.name] = _bondinfo(dev)
elif dev.isVLAN():
- d['vlans'][dev.name] = _vlaninfo(dev, ipaddrs)
+ info = d['vlans'][dev.name] = _vlaninfo(dev)
+ else:
+ continue
+ info.update(_devinfo(link, ipaddrs))
_cfgBootprotoCompat(d)
--
To view, visit http://gerrit.ovirt.org/28700
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b59b9539ee759d06f44e51cf8bbddca52450ac5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvob...@redhat.com>
_______________________________________________
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
