You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/01/07 08:07:37 UTC
git commit: updated refs/heads/master to 05df0cb
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 <gi...@clogeny.com>
Authored: Tue Jan 7 12:37:18 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
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