DaanHoogland closed pull request #2755: Fix migrate vol xen vmware test
URL: https://github.com/apache/cloudstack/pull/2755
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/test/integration/smoke/test_volumes.py
b/test/integration/smoke/test_volumes.py
index 2a86820f837..633c30079c0 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -929,11 +929,16 @@ def test_11_migrate_volume_and_change_offering(self):
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
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
