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 18:23:30 UTC
[1/2] git commit: updated refs/heads/master to 40b59d7
Updated Branches:
refs/heads/master a8ad90866 -> 40b59d7e2
CLOUDSTACK-2882: Additional device types for IDE/SCSI
Signed-off-by: Prasanna Santhanam <ts...@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 <ts...@apache.org>
Authored: Sat Jul 27 19:46:37 2013 +0530
Committer: Prasanna Santhanam <ts...@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:
[2/2] git commit: updated refs/heads/master to 40b59d7
Posted by ts...@apache.org.
CLOUDSTACK-2882: We are mounting an ISO not a volume
So fdisk -l doesn't list the mounted iso. Instead use showmount -e to
find the mounted device.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 93f79e1a158cb1f69915a4036f5c1840a38c5e53)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40b59d7e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40b59d7e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40b59d7e
Branch: refs/heads/master
Commit: 40b59d7e2acfb88d65d9374e9723b7fe38eabf3c
Parents: 738523b
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Sat Jul 27 20:18:05 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 27 21:53:16 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vm_life_cycle.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40b59d7e/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 7dab5cf..8e5a8bb 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -749,7 +749,7 @@ class TestVMLifeCycle(cloudstackTestCase):
else:
self.skipTest("No mount points matched. Mount was unsuccessful")
- c = "fdisk -l|grep %s|head -1" % self.services["mount"]
+ c = "mount |grep %s|head -1" % self.services["mount"]
res = ssh_client.execute(c)
self.debug("Found a mount point at %s" % res)
@@ -775,7 +775,7 @@ class TestVMLifeCycle(cloudstackTestCase):
self.assertEqual(
str(iso_size) in result,
True,
- "Check size of the attached ISO"
+ "ISO size mismatch. reported size within guest %s" % str(iso_size)
)
try:
#Unmount ISO