New subject: Change in vdsm[master]: netinfo: report "speed" of underlying device as that of vlan...

Tuesday, 25 February 2014

Antoni Segura Puimedon has uploaded a new change for review.

Change subject: make vlan speed reporting show the vlan underlying device speed
......................................................................

make vlan speed reporting show the vlan underlying device speed

vdsm was reporting speed 0 for the vlan devices and letting the
engine put a default value of 1000mbps for them. This patch
increases the level of information that reaches the engine by
making the vlan reported speed be its maximum theoretical speed,
i.e., the speed of the device which provides link to it.

Change-Id: Iee7f1ea72c77bb628640c1b2b27aac51811c8b0d
Bug-Url: https://bugzilla.redhat.com/1062617
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com&gt;
---
M lib/vdsm/netinfo.py
M vdsm/sampling.py
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/24990/1

diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 421d11b..4c7803b 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -249,6 +249,18 @@
         return operstateFile.read().strip()
 
 
+def vlanSpeed(vlanName):
+    """Returns the vlan's underlying device speed."""
+    vlanDevice = getLink(getVlanDevice(vlanName))
+    if vlanDevice.isNIC():
+        speed = nicSpeed(vlanDevice)
+    elif vlanDevice.isBOND():
+        speed = bondSpeed(vlanDevice)
+    else:
+        speed = 0
+    return speed
+
+
 def nicSpeed(nicName):
     """Returns the nic speed if it is a legal value and nicName refers to
a
     nic, 0 otherwise."""
diff --git a/vdsm/sampling.py b/vdsm/sampling.py
index 6b55f87..35a6616 100644
--- a/vdsm/sampling.py
+++ b/vdsm/sampling.py
@@ -393,6 +393,8 @@
                 speed = netinfo.nicSpeed(dev.name)
             elif dev.isBOND():
                 speed = netinfo.bondSpeed(dev.name)
+            elif dev.isVLAN():
+                speed = netinfo.vlanSpeed(dev.name)
             else:
                 speed = 0
             self._ifrates.append(speed)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee7f1ea72c77bb628640c1b2b27aac51811c8b0d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: make vlan speed reporting show the vlan underlying device speed