Change in vdsm[master]: Remove unused onlyDataDomains parameter from getImageDomains...

ewarszaw at redhat.com ewarszaw at redhat.com
Mon Mar 11 12:06:51 UTC 2013


Eduardo has uploaded a new change for review.

Change subject: Remove unused onlyDataDomains parameter from getImageDomainsList.
......................................................................

Remove unused onlyDataDomains parameter from getImageDomainsList.

(Required for next patch.)

Change-Id: I25fe2714e4c4e832230653cebc87d8da0e81028b
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/API.py
M vdsm/storage/hsm.py
M vdsm/storage/sp.py
M vdsm_cli/vdsClient.py
4 files changed, 6 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/12926/1

diff --git a/vdsm/API.py b/vdsm/API.py
index 0046b57..578617b 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -962,9 +962,8 @@
     def getFloppyList(self):
         return self._irs.getFloppyList(self._UUID)
 
-    def getDomainsContainingImage(self, imgUUID, onlyDataDomains=True):
-        return self._irs.getImageDomainsList(self._UUID, imgUUID,
-                                             onlyDataDomains)
+    def getDomainsContainingImage(self, imgUUID):
+        return self._irs.getImageDomainsList(self._UUID, imgUUID)
 
     def getIsoList(self, filenameExtension='iso'):
         return self._irs.getIsoList(self._UUID, filenameExtension)
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 23621f9..e8d3dbb 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3255,8 +3255,7 @@
         return {"results": res}
 
     @public
-    def getImageDomainsList(self, spUUID, imgUUID, datadomains=True,
-                            options=None):
+    def getImageDomainsList(self, spUUID, imgUUID, options=None):
         """
         Gets a list of all domains in the pool that contains imgUUID.
 
@@ -3282,8 +3281,7 @@
         for sdUUID in domList:
             vars.task.getSharedLock(STORAGE, sdUUID)
 
-        domainslist = pool.getImageDomainsList(imgUUID=imgUUID,
-                                               datadomains=datadomains)
+        domainslist = pool.getImageDomainsList(imgUUID=imgUUID)
         return dict(domainslist=domainslist)
 
     @public
diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 5ce07d3..b578175 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -1650,7 +1650,7 @@
                 dom.createMasterTree()
 
     @unsecured
-    def getImageDomainsList(self, imgUUID, datadomains=True):
+    def getImageDomainsList(self, imgUUID):
         """
         Get list of all domains in the pool that contain imgUUID
          'imgUUID' - image UUID
@@ -1668,9 +1668,6 @@
             except Exception:
                 # Pass over invisible active domains
                 self.log.error("Unexpected error", exc_info=True)
-                continue
-
-            if datadomains and not d.isData():
                 continue
 
             imageslist = d.getAllImages()
diff --git a/vdsm_cli/vdsClient.py b/vdsm_cli/vdsClient.py
index 1da7d5f..b332126 100644
--- a/vdsm_cli/vdsClient.py
+++ b/vdsm_cli/vdsClient.py
@@ -1130,11 +1130,7 @@
     def getImageDomainsList(self, args):
         spUUID = args[0]
         imgUUID = args[1]
-        if len(args) > 2:
-            sdUUID = args[2]
-            domains = self.s.getImageDomainsList(spUUID, imgUUID, sdUUID)
-        else:
-            domains = self.s.getImageDomainsList(spUUID, imgUUID)
+        domains = self.s.getImageDomainsList(spUUID, imgUUID)
         if domains['status']['code']:
             return domains['status']['code'], domains['status']['message']
         for entry in domains['domainslist']:


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

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


More information about the vdsm-patches mailing list