mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-15 18:12:35 +01:00
CLOUDSTACK-2882: Additional device types for IDE/SCSI
Signed-off-by: Prasanna Santhanam <tsp@apache.org> (cherry picked from commit b39d302888f965c5c26812b556c2dc395c53bb5c)
This commit is contained in:
parent
a8ad908666
commit
738523b57c
@ -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:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user