Change in vdsm[master]: Unify produceVolume

deepakcs at linux.vnet.ibm.com deepakcs at linux.vnet.ibm.com
Fri Sep 21 04:39:15 UTC 2012


Deepak C Shetty has uploaded a new change for review.

Change subject: Unify produceVolume
......................................................................

Unify produceVolume

Unify produceVolume function and make it use getVolumeClass
so that subclasses can override getVolumeClass to specify
their own Volume and ensure that produceVolume works
properly with subclass supplying their own volumeclass.

Change-Id: I367582b2741dc0276ec64d8d13fa1e4953f0314b
Signed-off-by: Deepak C Shetty <deepakcs at linux.vnet.ibm.com>
---
M vdsm/storage/blockSD.py
M vdsm/storage/fileSD.py
M vdsm/storage/sd.py
3 files changed, 7 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/8115/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index e596fb6..2da277d 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -477,14 +477,6 @@
         return time.time() - t
 
 
-    def produceVolume(self, imgUUID, volUUID):
-        """
-        Produce a type specific volume object
-        """
-        repoPath = self._getRepoPath()
-        return blockVolume.BlockVolume(repoPath, self.sdUUID, imgUUID, volUUID)
-
-
     def getVolumeClass(self):
         """
         Return a type specific volume generator object
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 054fadb..ae06c90 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -215,13 +215,6 @@
             filesDict[fileName] = stats
         return filesDict
 
-    def produceVolume(self, imgUUID, volUUID):
-        """
-        Produce a type specific volume object
-        """
-        repoPath = self._getRepoPath()
-        return fileVolume.FileVolume(repoPath, self.sdUUID, imgUUID, volUUID)
-
     def getVolumeClass(self):
         """
         Return a type specific volume generator object
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 55c5b12..4e7485f 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -358,6 +358,13 @@
             self.log.warn("Resource namespace %s already registered",
                           volumeResourcesNamespace)
 
+    def produceVolume(self, imgUUID, volUUID):
+        """
+        Produce a type specific volume object
+        """
+        repoPath = self._getRepoPath()
+        return self.getVolumeClass()(repoPath, self.sdUUID, imgUUID, volUUID)
+
     def getVolumeClass(self):
         """
         Return a type specific volume generator object


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I367582b2741dc0276ec64d8d13fa1e4953f0314b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Deepak C Shetty <deepakcs at linux.vnet.ibm.com>


More information about the vdsm-patches mailing list