Change in vdsm[master]: netinfo: rename variables in get()

osvoboda at redhat.com osvoboda at redhat.com
Wed Sep 30 19:47:19 UTC 2015


Ondřej Svoboda has uploaded a new change for review.

Change subject: netinfo: rename variables in get()
......................................................................

netinfo: rename variables in get()

Change-Id: I3bcf1780c97e15b12543293db69addd96d0ac586
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 17 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/74/46874/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index ad75d67..38e2fa6 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -34,6 +34,8 @@
 import struct
 import xml.etree.cElementTree as etree
 
+import six
+
 from . import constants
 from .ipwrapper import drv_name
 from .ipwrapper import DUMMY_BRIDGE
@@ -769,8 +771,8 @@
 
 
 def get(vdsmnets=None):
-    d = {'bondings': {}, 'bridges': {}, 'networks': {}, 'nics': {},
-         'vlans': {}}
+    networking = {'bondings': {}, 'bridges': {}, 'networks': {}, 'nics': {},
+                  'vlans': {}}
     paddr = permAddr()
     ipaddrs = _getIpAddrs()
     dhcpv4_ifaces, dhcpv6_ifaces = _get_dhclient_ifaces()
@@ -779,22 +781,23 @@
 
     if vdsmnets is None:
         libvirt_nets = networks()
-        d['networks'] = libvirtNets2vdsm(libvirt_nets, running_config, routes,
-                                         ipaddrs, dhcpv4_ifaces, dhcpv6_ifaces)
+        networking['networks'] = libvirtNets2vdsm(libvirt_nets, running_config,
+                                                  routes, ipaddrs,
+                                                  dhcpv4_ifaces, dhcpv6_ifaces)
     else:
-        d['networks'] = vdsmnets
+        networking['networks'] = vdsmnets
 
-    netinfo_by_device = _netinfo_by_device(d['networks'])
+    netinfo_by_device = _netinfo_by_device(networking['networks'])
 
     for dev in (link for link in getLinks() if not link.isHidden()):
         if dev.isBRIDGE():
-            devinfo = d['bridges'][dev.name] = _bridgeinfo(dev)
+            devinfo = networking['bridges'][dev.name] = _bridgeinfo(dev)
         elif dev.isNICLike():
-            devinfo = d['nics'][dev.name] = _nicinfo(dev, paddr)
+            devinfo = networking['nics'][dev.name] = _nicinfo(dev, paddr)
         elif dev.isBOND():
-            devinfo = d['bondings'][dev.name] = _bondinfo(dev)
+            devinfo = networking['bondings'][dev.name] = _bondinfo(dev)
         elif dev.isVLAN():
-            devinfo = d['vlans'][dev.name] = _vlaninfo(dev)
+            devinfo = networking['vlans'][dev.name] = _vlaninfo(dev)
         else:
             continue
         devinfo.update(_devinfo(dev, routes, ipaddrs, dhcpv4_ifaces,
@@ -804,11 +807,11 @@
             _bondOptsCompat(devinfo)
             _bondCustomOpts(dev, devinfo, running_config)
 
-    for net, attrs in d['networks'].iteritems():
-        if attrs['bridged']:
-            attrs['cfg'] = d['bridges'][net]['cfg']
+    for network, network_info in six.iteritems(networking['networks']):
+        if network_info['bridged']:
+            network_info['cfg'] = networking['bridges'][network]['cfg']
 
-    return d
+    return networking
 
 
 def isVlanned(dev):


-- 
To view, visit https://gerrit.ovirt.org/46874
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bcf1780c97e15b12543293db69addd96d0ac586
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list