From f04da1978f5ef6a5da4e5b50d6ad6c0f341dc02e Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Tue, 7 Jan 2014 12:34:17 +0530 Subject: [PATCH] Revert "CLOUDSTACK-5637: Detach volume before migrating" Volume need not be detached before being migrated. This reverts commit 3b3adbf71268fea526e91a94e7d64fe511daf840. --- test/integration/component/test_stopped_vm.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index e8a90b70843..e700c46f04d 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -891,8 +891,6 @@ class TestDeployVM(cloudstackTestCase): "Running", "VM should be in Running state after deployment" ) - - self.debug("Stopping instance: %s" % self.virtual_machine.name) self.virtual_machine.stop(self.apiclient) self.debug("Instance is stopped!") @@ -941,11 +939,6 @@ class TestDeployVM(cloudstackTestCase): self.storage_id = spool.id self.storage_name = spool.name break - - self.debug("Detaching volume %s from vm %s" % (vol_response.id, self.virtual_machine.id)) - - self.virtual_machine.detach_volume(self.apiclient, vol_response) - self.debug("Migrating volume to storage pool: %s" % self.storage_name) Volume.migrate( self.apiclient, @@ -954,14 +947,14 @@ class TestDeployVM(cloudstackTestCase): ) volume = Volume.list( self.apiclient, - virtualmachineid=self.virtual_machine.id, - type="ROOT", - listall=True, + virtualmachineid=self.virtual_machine.id, + type='ROOT', + listall=True ) self.assertEqual( volume[0].storage, self.storage_name, - "Check volume migration response vol.storage %s self.storage_name %s" % (volume[0].storage, self.storage_name)) + "Check volume migration response") return