Revert "CLOUDSTACK-5637: Detach volume before migrating"

This reverts commit 6c9b517929b0be7a44eae830b9b7b6823850c638.
This commit is contained in:
Girish Shilamkar 2014-01-07 12:37:18 +05:30
parent 4dcc5671d1
commit 05df0cb823

View File

@ -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