Deepak C Shetty has uploaded a new change for review. Change subject: tests/functional: Use deleteVolume instead of deleteImage ......................................................................
tests/functional: Use deleteVolume instead of deleteImage Since we are creating a volume, the undo/rollback should do deleteVolume instead of deleteImage. deleteImage does not work well for derived filedomains (eg. glusterSD) as it does not honor the volumeClass associated with the derived domain, so its not possible to write a test using deleteImage for glusterSD. Technically too, deleteVolume fits the current flow of testcase better than deleteImage as there isn't a chain of volumes being created to be really justified to use deleteImage Change-Id: Id9b8f598fcad03b689e14d09ab33c98ec1626f3d Signed-off-by: Deepak C Shetty <[email protected]> --- M tests/functional/xmlrpcTests.py 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/10195/1 diff --git a/tests/functional/xmlrpcTests.py b/tests/functional/xmlrpcTests.py index c259533..5584c19 100644 --- a/tests/functional/xmlrpcTests.py +++ b/tests/functional/xmlrpcTests.py @@ -236,7 +236,7 @@ self._createStoragePool(storagePools, rollback) self._startSPM(storagePools, rollback) self._attachStorageDomain(storagePools, layout, rollback) - self._createImage(images, layout, rollback) + self._createVolume(images, layout, rollback) def _createStorageDomain(self, storageDomains, typeSpecificArgs, rollback): for sdid, domain in storageDomains.iteritems(): @@ -306,7 +306,7 @@ r = self.s.activateStorageDomain(sdid, poolid) self.assertVdsOK(r) - def _createImage(self, images, layout, rollback): + def _createVolume(self, images, layout, rollback): for poolid, domains in layout.iteritems(): for sdid, imageList in domains.iteritems(): for imgid in imageList: @@ -320,10 +320,11 @@ self.assertVdsOK(r) tid = r['uuid'] self._waitTask(tid) - undo = lambda sdid=sdid, poolid=poolid, imgid=imgid: \ + undo = lambda sdid=sdid, poolid=poolid, \ + imgid=imgid, volid=volume['volid']: \ self._waitTask( - self.s.deleteImage( - sdid, poolid, imgid)['uuid']) + self.s.deleteVolume( + sdid, poolid, imgid, [volid])['uuid']) rollback.prependDefer(undo) def _waitTask(self, taskId): -- To view, visit http://gerrit.ovirt.org/10195 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id9b8f598fcad03b689e14d09ab33c98ec1626f3d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Deepak C Shetty <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
