Remove invalid references to diskdevice from tests Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 9e2eeb21ab8da66e50618838f225a4df4ad51309)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9d970a03 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9d970a03 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9d970a03 Branch: refs/heads/master-6-17-stable Commit: 9d970a032a4a0077cf5884fbd1e5a5bfaf166729 Parents: eeb8a2f Author: Prasanna Santhanam <[email protected]> Authored: Tue Jun 18 12:47:50 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sat Jun 29 00:52:07 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_explicit_dedication.py | 3 --- test/integration/component/test_implicit_planner.py | 3 --- test/integration/component/test_redundant_router.py | 7 ------- test/integration/component/test_storage_motion.py | 3 --- test/integration/component/test_volumes.py | 3 --- test/integration/smoke/test_nic.py | 3 --- test/integration/smoke/test_resource_detail.py | 3 --- test/integration/smoke/test_scale_vm.py | 3 --- test/integration/smoke/test_vm_life_cycle.py | 2 +- test/integration/smoke/test_volumes.py | 1 - 10 files changed, 1 insertion(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/component/test_explicit_dedication.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_explicit_dedication.py b/test/integration/component/test_explicit_dedication.py index 21a4904..e1991ac 100644 --- a/test/integration/component/test_explicit_dedication.py +++ b/test/integration/component/test_explicit_dedication.py @@ -87,9 +87,6 @@ class Services: "name": "Cent OS Template", "passwordenabled": True, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, "ostype": 'CentOS 5.3 (64-bit)' http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/component/test_implicit_planner.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_implicit_planner.py b/test/integration/component/test_implicit_planner.py index ffcd248..854b481 100644 --- a/test/integration/component/test_implicit_planner.py +++ b/test/integration/component/test_implicit_planner.py @@ -80,9 +80,6 @@ class Services: "name": "Cent OS Template", "passwordenabled": True, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, #Migrate VM to hostid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/component/test_redundant_router.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_redundant_router.py b/test/integration/component/test_redundant_router.py index a87818a..914b174 100644 --- a/test/integration/component/test_redundant_router.py +++ b/test/integration/component/test_redundant_router.py @@ -65,13 +65,6 @@ class Services: "publicport": 22, "protocol": 'TCP', }, - "volume": { - "diskname": "APP Data Volume", - "size": 1, - # in GBs - "diskdevice": "/dev/xvdb", - # Data Disk - }, "static_nat": { "startport": 22, "endport": 22, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/component/test_storage_motion.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py index 0dcc7f8..eda77d1 100644 --- a/test/integration/component/test_storage_motion.py +++ b/test/integration/component/test_storage_motion.py @@ -79,9 +79,6 @@ class Services: "name": "Cent OS Template", "passwordenabled": True, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, #Migrate VM to hostid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/component/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 34a0679..369cefc 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -26,10 +26,7 @@ from marvin.integration.lib.base import * from marvin.integration.lib.common import * from marvin.remoteSSHClient import remoteSSHClient #Import System modules -import os -import urllib import time -import tempfile class Services: http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/smoke/test_nic.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index 8e8d340..0d43a92 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -122,9 +122,6 @@ class Services: "name": "Cent OS Template", "passwordenabled": True, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, #Migrate VM to hostid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/smoke/test_resource_detail.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_resource_detail.py b/test/integration/smoke/test_resource_detail.py index 1d5db3a..93bc2ff 100644 --- a/test/integration/smoke/test_resource_detail.py +++ b/test/integration/smoke/test_resource_detail.py @@ -91,9 +91,6 @@ class Services: "name": "xs", "passwordenabled": False, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, #Migrate VM to hostid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/smoke/test_scale_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py index e79e126..fd8d61e 100644 --- a/test/integration/smoke/test_scale_vm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -85,9 +85,6 @@ class Services: "name": "xs", "passwordenabled": False, }, - "diskdevice": '/dev/xvdd', - # Disk device where ISO is attached to instance - "mount_dir": "/mnt/tmp", "sleep": 60, "timeout": 10, #Migrate VM to hostid http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/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 9aaa13f..a728347 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -739,7 +739,7 @@ class TestVMLifeCycle(cloudstackTestCase): self.debug("Found %s host" % hosts[0].hypervisor) if hosts[0].hypervisor.lower() == "kvm": - self.services["diskdevice"] = "/dev/vda" + self.services["diskdevice"] = "/dev/vdb" try: ssh_client = self.virtual_machine.get_ssh_client() http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9d970a03/test/integration/smoke/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index 7039c6f..4c4b780 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -80,7 +80,6 @@ class Services: "privateport": 22, "publicport": 22, "protocol": 'TCP', - "diskdevice": "/dev/xvdb", "ostype": 'CentOS 5.5 (64-bit)', "sleep": 10, "timeout": 600,
