[17/19] git commit: updated refs/heads/4.9 to 20986ba

[bh...@apache.org]

CLOUDSTACK-9688: Fix failing test_volumes on centos7/kvm

Due to OS/hypervisor/environmental configuration, detaching a disk/device
using libvirt can be successful without updating the domain configuration (xml).
This leads to reattachment failure as the device is blocked until the next
reboot. This fixes a specific environment case by performing stop/start on
the VM only in case of KVM, which will recreate a fresh domain config (xml)
as KVM VMs have transient domain configs (xmls don't persist).

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cdbe847d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cdbe847d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cdbe847d

Branch: refs/heads/4.9
Commit: cdbe847d29cb077f18913c981459d6b923dc458a
Parents: 52f224f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Dec 22 15:20:54 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Dec 22 15:23:00 2016 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_volumes.py | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cdbe847d/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 4dcf263..28087b1 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -378,6 +378,11 @@ class TestVolumes(cloudstackTestCase):
         #Clean up, terminate the created volumes
         if self.attached:
             self.virtual_machine.detach_volume(self.apiClient, self.volume)
+
+        if self.virtual_machine.hypervisor == "KVM":
+            self.virtual_machine.stop(self.apiClient)
+            self.virtual_machine.start(self.apiClient)
+
         cleanup_resources(self.apiClient, self.cleanup)
         return