Change in vdsm[master]: getIsoList() returns dict with files metadata

Tuesday, 24 September 2013

Sergey Gotliv has uploaded a new change for review.

Change subject: getIsoList() returns dict with files metadata
......................................................................

getIsoList() returns dict with files metadata

Previously getIsoList() returned only list of file names although it has
additional information such as file size. Absence of this information
prevented Engine to display correct data.

Now this API returns all information about these files. It also returns
the information in the old format in order to support old Engine
versions.

Change-Id: I0b28488a81cec756188ed763e4489b8a39b2b05d
Bug-Url: https://bugzilla.redhat.com/1005889
Signed-off-by: Sergey Gotliv <sgotliv(a)redhat.com&gt;
---
M vdsm/storage/hsm.py
1 file changed, 12 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/19544/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 9cfabdb..10ab687 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2240,7 +2240,8 @@
     @public
     def getIsoList(self, spUUID, extension='iso', options=None):
         """
-        Gets a list of all ISO/Floppy volumes in a storage pool.
+        Gets a dict of ISO/floppy files in a storage pool. For backward
+        compatibility also return a list of file names.
 
         :param spUUID: The UUID of the storage pool you want to query.
         :type spUUID: UUID
@@ -2248,7 +2249,7 @@
         :type extension: str
         :options: ?
 
-        :returns: a dict of all the volumes found.
+        :returns: a dict with files info
         :rtype: dict
         """
         vars.task.setDefaultException(se.GetIsoListError(spUUID))
@@ -2257,18 +2258,20 @@
         if not isoDom:
             raise se.GetIsoListError(spUUID)
 
-        # Get full iso files dictionary
-        isodict = isoDom.getFileList(pattern='*.' + extension,
+        found = isoDom.getFileList(pattern='*.' + extension,
                                      caseSensitive=False)
-        # Get list of iso images with proper permissions only
-        isolist = [key for key, value in isodict.items()
-                   if isodict[key]['status'] == 0]
-        return {'isolist': isolist}
+
+        # Filter out files without proper permissions
+        filtered = dict((key, value) for key, value in found.items()
+                   if found[key]['status'] == 0)
+
+        return {'isolist': filtered.keys(), 'isodict': filtered}
 
     @public
     def getFloppyList(self, spUUID, options=None):
         """
-        Gets a list of all Floppy volumes if a storage pool.
+        Gets a dict of floppy files in a storage pool. For backward
+        compatibility also return a list of file names.
 
         :param spUUID: The UUID of the storage pool you want to query.
         :type spUUID: UUID


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b28488a81cec756188ed763e4489b8a39b2b05d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Sergey Gotliv <sgotliv(a)redhat.com&gt;

    

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011