You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/27 16:17:20 UTC
git commit: updated refs/heads/4.2 to b39d302
Updated Branches:
refs/heads/4.2 a851ad243 -> b39d30288
CLOUDSTACK-2882: Additional device types for IDE/SCSI
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
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 <ts...@apache.org>
Authored: Sat Jul 27 19:46:37 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
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: