From 05df0cb823bf42173963ddd00e8476a4a0e587f9 Mon Sep 17 00:00:00 2001
From: Girish Shilamkar <girish@clogeny.com>
Date: Tue, 7 Jan 2014 12:37:18 +0530
Subject: [PATCH] Revert "CLOUDSTACK-5637: Detach volume before migrating"

This reverts commit 6c9b517929b0be7a44eae830b9b7b6823850c638.
---
 test/integration/component/test_stopped_vm.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index e8a90b70843..4ba94bfc293 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