apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove invalid references to diskdevice from tests

Browse Source 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-06-18 12:47:50 +05:30
parent 8801205fcf
commit 9e2eeb21ab
10 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/integration/component/test_explicit_dedication.py
View File

@ -87,9 +87,6 @@ class Services:
"name": "Cent OS Template", "name": "Cent OS Template",
"passwordenabled": True, "passwordenabled": True,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
"ostype": 'CentOS 5.3 (64-bit)' "ostype": 'CentOS 5.3 (64-bit)'

3
test/integration/component/test_implicit_planner.py
View File

@ -80,9 +80,6 @@ class Services:
"name": "Cent OS Template", "name": "Cent OS Template",
"passwordenabled": True, "passwordenabled": True,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
#Migrate VM to hostid #Migrate VM to hostid

7
test/integration/component/test_redundant_router.py
View File

@ -65,13 +65,6 @@ class Services:
"publicport": 22, "publicport": 22,
"protocol": 'TCP', "protocol": 'TCP',
}, },
"volume": {
"diskname": "APP Data Volume",
"size": 1,
# in GBs
"diskdevice": "/dev/xvdb",
# Data Disk
},
"static_nat": { "static_nat": {
"startport": 22, "startport": 22,
"endport": 22, "endport": 22,

3
test/integration/component/test_storage_motion.py
View File

@ -79,9 +79,6 @@ class Services:
"name": "Cent OS Template", "name": "Cent OS Template",
"passwordenabled": True, "passwordenabled": True,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
#Migrate VM to hostid #Migrate VM to hostid

3
test/integration/component/test_volumes.py
View File

@ -26,10 +26,7 @@ from marvin.integration.lib.base import *
from marvin.integration.lib.common import * from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient from marvin.remoteSSHClient import remoteSSHClient
#Import System modules #Import System modules
import os
import urllib
import time import time
import tempfile
class Services: class Services:

3
test/integration/smoke/test_nic.py
View File

@ -122,9 +122,6 @@ class Services:
"name": "Cent OS Template", "name": "Cent OS Template",
"passwordenabled": True, "passwordenabled": True,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
#Migrate VM to hostid #Migrate VM to hostid

3
test/integration/smoke/test_resource_detail.py
View File

@ -91,9 +91,6 @@ class Services:
"name": "xs", "name": "xs",
"passwordenabled": False, "passwordenabled": False,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
#Migrate VM to hostid #Migrate VM to hostid

3
test/integration/smoke/test_scale_vm.py
View File

@ -85,9 +85,6 @@ class Services:
"name": "xs", "name": "xs",
"passwordenabled": False, "passwordenabled": False,
}, },
"diskdevice": '/dev/xvdd',
# Disk device where ISO is attached to instance
"mount_dir": "/mnt/tmp",
"sleep": 60, "sleep": 60,
"timeout": 10, "timeout": 10,
#Migrate VM to hostid #Migrate VM to hostid

2
test/integration/smoke/test_vm_life_cycle.py
View File

@ -739,7 +739,7 @@ class TestVMLifeCycle(cloudstackTestCase):
self.debug("Found %s host" % hosts[0].hypervisor) self.debug("Found %s host" % hosts[0].hypervisor)
if hosts[0].hypervisor.lower() == "kvm": if hosts[0].hypervisor.lower() == "kvm":
self.services["diskdevice"] = "/dev/vda" self.services["diskdevice"] = "/dev/vdb"
try: try:
ssh_client = self.virtual_machine.get_ssh_client() ssh_client = self.virtual_machine.get_ssh_client()

1
test/integration/smoke/test_volumes.py
View File

@ -80,7 +80,6 @@ class Services:
"privateport": 22, "privateport": 22,
"publicport": 22, "publicport": 22,
"protocol": 'TCP', "protocol": 'TCP',
"diskdevice": "/dev/xvdb",
"ostype": 'CentOS 5.5 (64-bit)', "ostype": 'CentOS 5.5 (64-bit)',
"sleep": 10, "sleep": 10,
"timeout": 600, "timeout": 600,