[cloudstack] branch master updated: Fix migrate vol xen vmware test (#2755)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new bd7a09b  Fix migrate vol xen vmware test (#2755)
bd7a09b is described below

commit bd7a09b5d91af5086ee8b85b23bb8c2472e52f97
Author: Boris Stoyanov - a.k.a Bobby <bss.stoya...@gmail.com>
AuthorDate: Fri Aug 17 14:32:15 2018 +0300

    Fix migrate vol xen vmware test (#2755)
---
 test/integration/smoke/test_volumes.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/integration/smoke/test_volumes.py 
b/test/integration/smoke/test_volumes.py
index 2a86820..633c300 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -929,11 +929,16 @@ class TestVolumes(cloudstackTestCase):
             StoragePool.update(self.apiclient, id=pool.id, tags="")
 
         self.debug("Migrating Volume-ID: %s to Pool: %s" % (volume.id, 
pool.id))
+        livemigrate = False
+        if self.virtual_machine.hypervisor.lower() == "vmware" or 
self.virtual_machine.hypervisor.lower() == 'xenserver':
+            livemigrate = True
+
         Volume.migrate(
             self.apiclient,
             volumeid = volume.id,
             storageid = pool.id,
-            newdiskofferingid = large_offering.id
+            newdiskofferingid = large_offering.id,
+            livemigrate = livemigrate
         )
         if self.virtual_machine.hypervisor == "KVM":
             self.virtual_machine.start(self.apiclient