Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB48610336 for ; Tue, 7 Jan 2014 07:05:40 +0000 (UTC) Received: (qmail 49072 invoked by uid 500); 7 Jan 2014 07:05:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 49038 invoked by uid 500); 7 Jan 2014 07:05:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 49027 invoked by uid 99); 7 Jan 2014 07:05:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 07:05:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D058E3890A; Tue, 7 Jan 2014 07:05:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: girish@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to f04da19 Date: Tue, 7 Jan 2014 07:05:26 +0000 (UTC) Updated Branches: refs/heads/4.3 14250413b -> f04da1978 Revert "CLOUDSTACK-5637: Detach volume before migrating" Volume need not be detached before being migrated. This reverts commit 3b3adbf71268fea526e91a94e7d64fe511daf840. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f04da197 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f04da197 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f04da197 Branch: refs/heads/4.3 Commit: f04da1978f5ef6a5da4e5b50d6ad6c0f341dc02e Parents: 1425041 Author: Girish Shilamkar Authored: Tue Jan 7 12:34:17 2014 +0530 Committer: Girish Shilamkar Committed: Tue Jan 7 12:34:17 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_stopped_vm.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f04da197/test/integration/component/test_stopped_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index e8a90b7..e700c46 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