Change in vdsm[master]: hsm: remove obsolete getVolumePath verb
Federico Simoncelli
fsimonce at redhat.com
Wed Sep 24 22:02:10 UTC 2014
Federico Simoncelli has uploaded a new change for review.
Change subject: hsm: remove obsolete getVolumePath verb
......................................................................
hsm: remove obsolete getVolumePath verb
We can remove the getVolumePath verb as it was never officially in use.
Change-Id: I7d15dee9e805478f4b4d2bfcb7985484db77339e
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
---
M client/vdsClient.py
M doc/storage/overview.rst
M vdsm/API.py
M vdsm/rpc/BindingXMLRPC.py
M vdsm/rpc/vdsmapi-schema.json
M vdsm/storage/hsm.py
6 files changed, 0 insertions(+), 75 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/33353/1
diff --git a/client/vdsClient.py b/client/vdsClient.py
index dafca9e..ecaecb9 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -1051,16 +1051,6 @@
print "\t%s = %s" % (element, info['info'][element])
return 0, ''
- def getVolumePath(self, args):
- sdUUID = args[0]
- spUUID = args[1]
- imgUUID = args[2]
- uuid = args[3]
- info = self.s.getVolumePath(sdUUID, spUUID, imgUUID, uuid)
- if info['status']['code']:
- return info['status']['code'], info['status']['message']
- return 0, info['path']
-
def getVolumeSize(self, args):
sdUUID = args[0]
spUUID = args[1]
@@ -2398,10 +2388,6 @@
'<spUUID> <sdUUID> <imgUUID> <volUUID> <newSize>',
'Extend the volume size (virtual disk size seen by the guest).',
)),
- 'getVolumePath': (serv.getVolumePath,
- ('<sdUUID> <spUUID> <imgUUID> <volume uuid>',
- 'Returns the path to the requested uuid'
- )),
'setVolumeDescription': (serv.setVolumeDescription,
('<sdUUID> <spUUID> <imgUUID> <volUUID> '
'<Description>',
diff --git a/doc/storage/overview.rst b/doc/storage/overview.rst
index 8077b4d..77b3017 100644
--- a/doc/storage/overview.rst
+++ b/doc/storage/overview.rst
@@ -10,7 +10,6 @@
Volume
------
-.. automethod:: vdsm.storage.hsm.HSM.getVolumePath
.. automethod:: vdsm.storage.hsm.HSM.getVolumeSize
.. automethod:: vdsm.storage.hsm.HSM.prepareVolume
.. automethod:: vdsm.storage.hsm.HSM.teardownVolume
diff --git a/vdsm/API.py b/vdsm/API.py
index 9c47b5f..7590308 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -796,10 +796,6 @@
return self._irs.getVolumeInfo(self._sdUUID, self._spUUID,
self._imgUUID, self._UUID)
- def getPath(self):
- return self._irs.getVolumePath(self._sdUUID, self._spUUID,
- self._imgUUID, self._UUID)
-
def getSize(self):
return self._irs.getVolumeSize(self._sdUUID, self._spUUID,
self._imgUUID, self._UUID)
diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py
index f2dcbdf..65499e4 100644
--- a/vdsm/rpc/BindingXMLRPC.py
+++ b/vdsm/rpc/BindingXMLRPC.py
@@ -862,10 +862,6 @@
volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
return volume.getInfo()
- def volumeGetPath(self, sdUUID, spUUID, imgUUID, volUUID):
- volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
- return volume.getPath()
-
def volumeGetSize(self, sdUUID, spUUID, imgUUID, volUUID):
volume = API.Volume(volUUID, spUUID, sdUUID, imgUUID)
return volume.getSize()
@@ -1099,7 +1095,6 @@
(self.volumeCreate, 'createVolume'),
(self.volumeExtendSize, 'extendVolumeSize'),
(self.volumeGetInfo, 'getVolumeInfo'),
- (self.volumeGetPath, 'getVolumePath'),
(self.volumeGetSize, 'getVolumeSize'),
(self.volumeSetSize, 'volumeSetSize'),
(self.volumeRefresh, 'refreshVolume'),
diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json
index 64868f3..6c25745 100644
--- a/vdsm/rpc/vdsmapi-schema.json
+++ b/vdsm/rpc/vdsmapi-schema.json
@@ -7592,29 +7592,6 @@
'returns': 'VolumeInfo'}
##
-# @Volume.getPath:
-#
-# Get the path to the Volume in the host's storage repository.
-#
-# @volumeID: The UUID of the Volume
-#
-# @storagepoolID: The Storage Pool associated with the Volume
-#
-# @storagedomainID: The Storage Domain associated with the Volume
-#
-# @imageID: The Image associated with the Volume
-#
-# Returns:
-# The Volume's storage repository path
-#
-# Since: 4.10.0
-##
-{'command': {'class': 'Volume', 'name': 'getPath'},
- 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID',
- 'storagedomainID': 'UUID', 'imageID': 'UUID'},
- 'returns': 'str'}
-
-##
# @VolumeSizeInfo:
#
# Volume size information:
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index cde80ff..cd6f4b9 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3156,34 +3156,6 @@
return dict(info=info)
@public
- def getVolumePath(self, sdUUID, spUUID, imgUUID, volUUID, options=None):
- """
- Gets the path to a volume.
-
- .. warning::
- This method is obsolete and is kept only for testing purposes;
- use prepareImage instead.
-
- :param sdUUID: The UUID of the storage domain that owns the volume.
- :type sdUUID: UUID
- :param spUUID: The UUID of the storage pool that owns the volume.
- :type spUUID: UUID
- :param imgUUID: The UUID of the image contained on the volume.
- :type imgUUID: UUID
- :param volUUID: The UUID of the volume you want to get it's path.
- :type volUUID: UUID
- :param options: ?
-
- :returns: a dict with the path to the volume.
- :rtype: dict
- """
- vars.task.getSharedLock(STORAGE, sdUUID)
- path = sdCache.produce(
- sdUUID=sdUUID).produceVolume(imgUUID=imgUUID,
- volUUID=volUUID).getVolumePath()
- return dict(path=path)
-
- @public
def appropriateDevice(self, guid, thiefId):
"""
Change ownership of the guid device to vdsm:qemu
--
To view, visit http://gerrit.ovirt.org/33353
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d15dee9e805478f4b4d2bfcb7985484db77339e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce at redhat.com>
More information about the vdsm-patches
mailing list