Change in vdsm[master]: netinfo: use link objects for getting known information

asegurap at redhat.com asegurap at redhat.com
Wed Jan 15 18:46:58 UTC 2014


Antoni Segura Puimedon has uploaded a new change for review.

Change subject: netinfo: use link objects for getting known information
......................................................................

netinfo: use link objects for getting known information

The link objects always contain certain information that used to be
retrieved separately. This patch avoids this extra info fetching.

Change-Id: I2f1235f4a565084d9cf0247ac81d189afb2efac5
Signed-off-by: Antoni S. Puimedon <asegurap at redhat.com>
---
M lib/vdsm/netinfo.py
1 file changed, 24 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/23291/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 3e2fe50..60746e9 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -494,40 +494,40 @@
     return data
 
 
-def _bridgeinfo(bridge, gateways, ipv6routes):
-    info = _devinfo(bridge)
-    info.update({'gateway': getgateway(gateways, bridge),
-                'ipv6gateway': ipv6routes.get(bridge, '::'),
-                'ports': ports(bridge), 'stp': bridge_stp_state(bridge)})
+def _bridgeinfo(link, gateways, ipv6routes):
+    info = _devinfo(link)
+    info.update({'gateway': getgateway(gateways, link.name),
+                'ipv6gateway': ipv6routes.get(link.name, '::'),
+                'ports': ports(link.name), 'stp': bridge_stp_state(link.name)})
     return info
 
 
-def _nicinfo(nic, paddr):
-    info = _devinfo(nic)
-    info.update({'hwaddr': gethwaddr(nic), 'speed': nicSpeed(nic)})
-    if paddr.get(nic):
-        info['permhwaddr'] = paddr[nic]
+def _nicinfo(link, paddr):
+    info = _devinfo(link)
+    info.update({'hwaddr': link.address, 'speed': nicSpeed(link.name)})
+    if paddr.get(link.name):
+        info['permhwaddr'] = paddr[link.name]
     return info
 
 
-def _bondinfo(bond):
-    info = _devinfo(bond)
-    info.update({'hwaddr': gethwaddr(bond), 'slaves': slaves(bond)})
+def _bondinfo(link):
+    info = _devinfo(link)
+    info.update({'hwaddr': link.address, 'slaves': slaves(link.name)})
     return info
 
 
-def _vlaninfo(vlan):
-    info = _devinfo(vlan)
-    info.update({'iface': getVlanDevice(vlan), 'vlanid': getVlanID(vlan)})
+def _vlaninfo(link):
+    info = _devinfo(link.name)
+    info.update({'iface': link.device, 'vlanid': link.vlanid})
     return info
 
 
-def _devinfo(dev):
-    ipv4addr, ipv4netmask, ipv6addrs = getIpInfo(dev)
+def _devinfo(link):
+    ipv4addr, ipv4netmask, ipv6addrs = getIpInfo(link.name)
     return {'addr': ipv4addr,
-            'cfg': getIfaceCfg(dev),
+            'cfg': getIfaceCfg(link.name),
             'ipv6addrs': ipv6addrs,
-            'mtu': str(getMtu(dev)),
+            'mtu': str(link.mtu),
             'netmask': ipv4netmask}
 
 
@@ -551,13 +551,13 @@
     for dev in (link for link in getLinks() if not link.isHidden()):
         if dev.isBRIDGE():
             d['bridges'][dev.name] = \
-                _bridgeinfo(dev.name, gateways, ipv6routes)
+                _bridgeinfo(dev, gateways, ipv6routes)
         elif dev.isNICLike():
-            d['nics'][dev.name] = _nicinfo(dev.name, paddr)
+            d['nics'][dev.name] = _nicinfo(dev, paddr)
         elif dev.isBOND():
-            d['bondings'][dev.name] = _bondinfo(dev.name)
+            d['bondings'][dev.name] = _bondinfo(dev)
         elif dev.isVLAN():
-            d['vlans'][dev.name] = _vlaninfo(dev.name)
+            d['vlans'][dev.name] = _vlaninfo(dev)
 
     return d
 


-- 
To view, visit http://gerrit.ovirt.org/23291
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f1235f4a565084d9cf0247ac81d189afb2efac5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>


More information about the vdsm-patches mailing list