Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 799A31163C for ; Wed, 11 Jun 2014 10:33:16 +0000 (UTC) Received: (qmail 50929 invoked by uid 500); 11 Jun 2014 10:33:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 50901 invoked by uid 500); 11 Jun 2014 10:33:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 50894 invoked by uid 99); 11 Jun 2014 10:33:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jun 2014 10:33:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 262C8927164; Wed, 11 Jun 2014 10:33:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4-forward to 280d167 Date: Wed, 11 Jun 2014 10:33:16 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward f14f36170 -> 280d16731 Fix for test_01_create_volume to use the correct volume name for KVM Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/280d1673 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/280d1673 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/280d1673 Branch: refs/heads/4.4-forward Commit: 280d167316d92a8d24d0917f8945b408b87677a8 Parents: f14f361 Author: Alex Brett Authored: Wed Jun 4 15:41:01 2014 +0100 Committer: SrikanteswaraRao Talluri Committed: Wed Jun 11 16:02:52 2014 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_volumes.py | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/280d1673/test/integration/smoke/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index d6db63f..2e41aa7 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]))