mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Remove invalid references to diskdevice from tests
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
parent
8801205fcf
commit
9e2eeb21ab
@ -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)'
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user