You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/30 13:09:07 UTC

git commit: updated refs/heads/4.4 to f657de5

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 800e40737 -> f657de540


Fix for test_01_create_volume to use the correct volume name for KVM

Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
(cherry picked from commit 280d167316d92a8d24d0917f8945b408b87677a8)


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

Branch: refs/heads/4.4
Commit: f657de5401b8a5e52599e14b7bd937c5a00f7ac9
Parents: 800e407
Author: Alex Brett <al...@citrix.com>
Authored: Wed Jun 4 15:41:01 2014 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jul 30 13:08:59 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f657de54/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 59139e4..70c9114 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -207,6 +207,10 @@ class TestCreateVolume(cloudstackTestCase):
                 volume_name = "/dev/xvd" + chr(ord('a') + int(list_volume_response[0].deviceid))
                 self.debug(" Using XenServer volume_name: %s" % (volume_name))
                 ret = checkVolumeSize(ssh_handle=ssh,volume_name=volume_name,size_to_verify=vol_sz)
+            elif list_volume_response[0].hypervisor.lower() == "kvm":
+                volume_name = "/dev/vd" + chr(ord('a') + int(list_volume_response[0].deviceid))
+                self.debug(" Using KVM volume_name: %s" % (volume_name))
+                ret = checkVolumeSize(ssh_handle=ssh,volume_name=volume_name,size_to_verify=vol_sz)
             else:
                 ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
             self.debug(" Volume Size Expected %s  Actual :%s" %(vol_sz,ret[1]))