Change in vdsm[master]: vm: small refactor for _normalizeVdsmImg

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: vm: small refactor for _normalizeVdsmImg
......................................................................

vm: small refactor for _normalizeVdsmImg

Change-Id: Ie68292eee4b82fbe8527e3960739979cfe117dfa
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com&gt;
---
M vdsm/vm.py
1 file changed, 18 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/57/19157/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index 92d274e..2605f24 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1779,25 +1779,26 @@
                 break
         return str(idx)
 
-    def _normalizeVdsmImg(self, drv):
-        drv['reqsize'] = drv.get('reqsize', '0')  # Backward
compatible
-        if 'device' not in drv:
-            drv['device'] = 'disk'
+    def _normalizeVdsmImg(self, drive):
+        drive['device'] = drive.get('device', 'disk')  # Disk by
default
+        drive['reqsize'] = drive.get('reqsize', '0')  # Backward
compatible
 
-        if drv['device'] == 'disk':
-            res = self.cif.irs.getVolumeSize(drv['domainID'],
drv['poolID'],
-                                             drv['imageID'],
drv['volumeID'])
-            try:
-                drv['truesize'] = res['truesize']
-                drv['apparentsize'] = res['apparentsize']
-            except KeyError:
-                self.log.error("Unable to get volume size for %s",
-                               drv['volumeID'], exc_info=True)
-                raise RuntimeError("Volume %s is corrupted or missing" %
-                                   drv['volumeID'])
+        if drive['device'] == 'disk':
+            volInfo = self.cif.irs.getVolumeInfo(
+                drive['domainID'], drive['poolID'],
drive['imageID'],
+                drive['volumeID'])
+
+            if volInfo.get('status', {}).get('code', -1):
+                self.log.error(
+                    "Unable to get volume info for %s",
drive['volumeID'])
+                raise RuntimeError(
+                    "Volume %s is corrupted or missing" %
drive['volumeID'])
+
+            drive['truesize'] = volInfo['info']['truesize']
+            drive['apparentsize'] =
volInfo['info']['apparentsize']
         else:
-            drv['truesize'] = 0
-            drv['apparentsize'] = 0
+            drive['truesize'] = 0
+            drive['apparentsize'] = 0
 
     @classmethod
     def _normalizeDriveSharedAttribute(self, drive):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie68292eee4b82fbe8527e3960739979cfe117dfa
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;