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 2013/12/31 07:04:47 UTC
git commit: updated refs/heads/master to 6c9b517
Updated Branches:
refs/heads/master 14241ce23 -> 6c9b51792
CLOUDSTACK-5637: Detach volume before migrating
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c9b5179
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c9b5179
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c9b5179
Branch: refs/heads/master
Commit: 6c9b517929b0be7a44eae830b9b7b6823850c638
Parents: 14241ce
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Tue Dec 31 11:34:16 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Tue Dec 31 11:34:16 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_stopped_vm.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c9b5179/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 4ba94bf..e8a90b7 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -22,6 +22,7 @@ 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 *
@@ -890,6 +891,8 @@ 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!")
@@ -938,6 +941,11 @@ 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,
@@ -946,14 +954,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")
+ "Check volume migration response vol.storage %s self.storage_name %s" % (volume[0].storage, self.storage_name))
return