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 42AC01034A for ; Tue, 7 Jan 2014 07:07:41 +0000 (UTC) Received: (qmail 53239 invoked by uid 500); 7 Jan 2014 07:07:39 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 53214 invoked by uid 500); 7 Jan 2014 07:07:38 -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 53206 invoked by uid 99); 7 Jan 2014 07:07:37 -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:07:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 475CF38923; Tue, 7 Jan 2014 07:07:37 +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: <6d85e499694d4c4cba2a6b10539f1532@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 05df0cb Date: Tue, 7 Jan 2014 07:07:37 +0000 (UTC) Updated Branches: refs/heads/master 4dcc5671d -> 05df0cb82 Revert "CLOUDSTACK-5637: Detach volume before migrating" This reverts commit 6c9b517929b0be7a44eae830b9b7b6823850c638. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/05df0cb8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/05df0cb8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/05df0cb8 Branch: refs/heads/master Commit: 05df0cb823bf42173963ddd00e8476a4a0e587f9 Parents: 4dcc567 Author: Girish Shilamkar Authored: Tue Jan 7 12:37:18 2014 +0530 Committer: Girish Shilamkar Committed: Tue Jan 7 12:37:18 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_stopped_vm.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/05df0cb8/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..4ba94bf 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -22,7 +22,6 @@ import marvin from nose.plugins.attrib import attr from marvin.cloudstackTestCase import * from marvin.cloudstackAPI import * -from marvin.sshClient import SshClient from marvin.integration.lib.utils import * from marvin.integration.lib.base import * from marvin.integration.lib.common import * @@ -891,8 +890,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 +938,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 +946,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