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 0C7EB101C8 for ; Sat, 27 Jul 2013 14:17:26 +0000 (UTC) Received: (qmail 42213 invoked by uid 500); 27 Jul 2013 14:17:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 42176 invoked by uid 500); 27 Jul 2013 14:17:22 -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 42161 invoked by uid 99); 27 Jul 2013 14:17:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Jul 2013 14:17:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1F5AFF558; Sat, 27 Jul 2013 14:17:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.2 to b39d302 Date: Sat, 27 Jul 2013 14:17:20 +0000 (UTC) Updated Branches: refs/heads/4.2 a851ad243 -> b39d30288 CLOUDSTACK-2882: Additional device types for IDE/SCSI Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b39d3028 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b39d3028 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b39d3028 Branch: refs/heads/4.2 Commit: b39d302888f965c5c26812b556c2dc395c53bb5c Parents: a851ad2 Author: Prasanna Santhanam Authored: Sat Jul 27 19:46:37 2013 +0530 Committer: Prasanna Santhanam Committed: Sat Jul 27 19:47:02 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_vm_life_cycle.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b39d3028/test/integration/smoke/test_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index c2c2592..7dab5cf 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -116,7 +116,7 @@ class Services: "name": "Cent OS Template", "passwordenabled": True, }, - "diskdevice": ['/dev/xvdd', '/dev/cdrom', '/dev/sr0', '/dev/cdrom1' ], + "diskdevice": ['/dev/vdc', '/dev/vdb', '/dev/hdb', '/dev/hdc', '/dev/xvdd', '/dev/cdrom', '/dev/sr0', '/dev/cdrom1' ], # Disk device where ISO is attached to instance "mount_dir": "/mnt/tmp", "sleep": 60, @@ -732,15 +732,6 @@ class TestVMLifeCycle(cloudstackTestCase): cmd.virtualmachineid = self.virtual_machine.id self.apiclient.attachIso(cmd) - #determine device type from hypervisor - hosts = Host.list(self.apiclient, id=self.virtual_machine.hostid) - self.assertTrue(isinstance(hosts, list)) - self.assertTrue(len(hosts) > 0) - self.debug("Found %s host" % hosts[0].hypervisor) - - if hosts[0].hypervisor.lower() == "kvm": - self.services["diskdevice"] = "/dev/vdb" - try: ssh_client = self.virtual_machine.get_ssh_client() except Exception as e: