cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/2] git commit: updated refs/heads/master to 40b59d7
Date Sat, 27 Jul 2013 16:23:30 GMT
Updated Branches:
  refs/heads/master a8ad90866 -> 40b59d7e2


CLOUDSTACK-2882: Additional device types for IDE/SCSI

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b39d302888f965c5c26812b556c2dc395c53bb5c)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/738523b5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/738523b5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/738523b5

Branch: refs/heads/master
Commit: 738523b57c61bcc3439d1433f9c6a78848cd413c
Parents: a8ad908
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jul 27 19:46:37 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jul 27 21:53:11 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/738523b5/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:


Mime
View raw message