Change in vdsm[master]: Related to BZ#845020 - Diffferentiate bad specification from...

ewarszaw at redhat.com ewarszaw at redhat.com
Tue Aug 21 08:58:00 UTC 2012


Eduardo has uploaded a new change for review.

Change subject: Related to BZ#845020 - Diffferentiate bad specification from not found.
......................................................................

Related to BZ#845020 - Diffferentiate bad specification from not found.

Already agreed that _devices should be a dict instead a list.

Change-Id: Ic5cffdae26cde88a948211d8577370965ecd2d36
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/libvirtvm.py
1 file changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/7366/1

diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 3b7cfc5..7ad5884 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1627,6 +1627,11 @@
                 if ((device.domainID, device.imageID,
                         device.volumeID) == tgetDrv):
                     return device
+            else:
+                self.log.warning("drive dom: %s, img: %s, vol: %s is not in"
+                                 "vm: %s _devices", drive["domainID"], 
+                                 drive["imageID"], drive["volumeID"], self.id)
+                return None
 
         elif drive.has_key("GUID"):
             for device in self._devices[vm.DISK_DEVICES][:]:
@@ -1634,6 +1639,10 @@
                     continue
                 if device.GUID == drive["GUID"]:
                     return device
+            else:
+                self.log.warning("GUID: %s not found in vm: %s _devices",
+                                 drive["GUID"], self.id)
+                return None
 
         elif drive.has_key("UUID"):
             for device in self._devices[vm.DISK_DEVICES][:]:
@@ -1641,8 +1650,13 @@
                     continue
                 if device.UUID == drive["UUID"]:
                     return device
+            else:
+                self.log.warning("UUID: %s not found in vm: %s _devices",
+                                 drive["UUID"], self.id)
+                return None
 
-        return None
+        else:
+            raise ValueError("drive specification unknown %s" % drive)
 
     def snapshot(self, snapDrives):
         """Live snapshot command"""


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5cffdae26cde88a948211d8577370965ecd2d36
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw at redhat.com>


More information about the vdsm-patches mailing list