From 738523b57c61bcc3439d1433f9c6a78848cd413c Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Sat, 27 Jul 2013 19:46:37 +0530 Subject: [PATCH] CLOUDSTACK-2882: Additional device types for IDE/SCSI Signed-off-by: Prasanna Santhanam (cherry picked from commit b39d302888f965c5c26812b556c2dc395c53bb5c) --- test/integration/smoke/test_vm_life_cycle.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index c2c25928375..7dab5cf26e7 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: