Change in vdsm[master]: VolumeMetadata: Move voltype property

alitke at redhat.com alitke at redhat.com
Fri Sep 18 20:46:23 UTC 2015


Adam Litke has uploaded a new change for review.

Change subject: VolumeMetadata: Move voltype property
......................................................................

VolumeMetadata: Move voltype property

Change-Id: I16ab5d9c0f30acc365596fb1d66b5688cbb2e4ba
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M tests/sdm_indirection_tests.py
M vdsm/storage/volume.py
2 files changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/46381/1

diff --git a/tests/sdm_indirection_tests.py b/tests/sdm_indirection_tests.py
index 2764c29..d331b2f 100644
--- a/tests/sdm_indirection_tests.py
+++ b/tests/sdm_indirection_tests.py
@@ -499,6 +499,7 @@
         ['imgUUID', 'e2a325e4-62be-4939-8145-72277c270e8e'],
         ['volUUID', '6aab5eb4-2a8b-4cb7-a0b7-bc6f61de3e18'],
         ['repoPath', '/rhev/data-center'],
+        ['voltype', None],
         ])
     def test_property(self, prop, val):
         self.assertEqual(getattr(self.source_inst, prop), val)
diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py
index f2d94f7..ec82c9b 100644
--- a/vdsm/storage/volume.py
+++ b/vdsm/storage/volume.py
@@ -134,6 +134,8 @@
         self.sdUUID = sdUUID
         self.imgUUID = imgUUID
         self.volUUID = volUUID
+        self.voltype = None
+
         if not imgUUID or imgUUID == BLANK_UUID:
             raise se.InvalidParameterException("imgUUID", imgUUID)
         if not volUUID or volUUID == BLANK_UUID:
@@ -147,7 +149,6 @@
         self.md = md
         self.volumePath = None
         self.imagePath = None
-        self.voltype = None
         self.validate()
 
     @property
@@ -165,6 +166,10 @@
     @property
     def repoPath(self):
         return self.md.repoPath
+
+    @property
+    def voltype(self):
+        return self.md.voltype
 
     @classmethod
     def _getModuleAndClass(cls):
@@ -654,7 +659,7 @@
 
     def setShared(self):
         self.setMetaParam(VOLTYPE, type2name(SHARED_VOL))
-        self.voltype = type2name(SHARED_VOL)
+        self.md.voltype = type2name(SHARED_VOL)
         self.setrw(rw=False)
         return self.voltype
 
@@ -673,19 +678,19 @@
 
     def setLeaf(self):
         self.setMetaParam(VOLTYPE, type2name(LEAF_VOL))
-        self.voltype = type2name(LEAF_VOL)
+        self.md.voltype = type2name(LEAF_VOL)
         self.setrw(rw=True)
         return self.voltype
 
     def setInternal(self):
         self.setMetaParam(VOLTYPE, type2name(INTERNAL_VOL))
-        self.voltype = type2name(INTERNAL_VOL)
+        self.md.voltype = type2name(INTERNAL_VOL)
         self.setrw(rw=False)
         return self.voltype
 
     def getVolType(self):
         if not self.voltype:
-            self.voltype = self.getMetaParam(VOLTYPE)
+            self.md.voltype = self.getMetaParam(VOLTYPE)
         return self.voltype
 
     def getSize(self):


-- 
To view, visit https://gerrit.ovirt.org/46381
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16ab5d9c0f30acc365596fb1d66b5688cbb2e4ba
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>


More information about the vdsm-patches mailing list