etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to scripts 

* remoteSSHClient import is fixed
* mount now explicitly specifies filesystem
This commit is contained in:
Prasanna Santhanam 2012-07-11 17:30:59 +05:30
parent dfede8cdeb
commit bd6d354975
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/integration/component/test_snapshots.py
View File

@ -64,9 +64,9 @@ class Services:
"protocol": 'TCP',
},
"mgmt_server": {
"ipaddress": '192.168.100.21',
"ipaddress": '10.223.133.41',
"username": "root",
"password": "fr3sca",
"password": "password",
"port": 22,
},
"recurring_snapshot": {
@ -80,7 +80,7 @@ class Services:
"templates": {
"displaytext": 'Template',
"name": 'Template',
"ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
"ostypeid": 'd847814b-e1fb-4310-afd5-ed64c1d13e6c',
"templatefilter": 'self',
},
"diskdevice": "/dev/xvda",
@ -93,7 +93,7 @@ class Services:
"sub_lvl_dir2": "test2",
"random_data": "random.data",
"ostypeid": '144f66aa-7f74-4cfe-9799-80cc21439cb3',
"ostypeid": 'd847814b-e1fb-4310-afd5-ed64c1d13e6c',
# Cent OS 5.3 (64 bit)
"sleep": 60,
"timeout": 10,
@ -338,7 +338,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
time.sleep(self.services["sleep"])
try:
# Login to VM to check snapshot present on sec disk
ssh_client = remoteSSHClient.remoteSSHClient(
ssh_client = remoteSSHClient(
self.services["mgmt_server"]["ipaddress"],
self.services["mgmt_server"]["port"],
self.services["mgmt_server"]["username"],
@ -347,7 +347,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["mount_dir"],
"mount %s/%s %s" % (
"mount -t nfs %s:/%s %s" % (
sec_storage_ip,
export_path,
self.services["mount_dir"]
@ -597,7 +597,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
time.sleep(self.services["sleep"])
try:
# Login to Secondary storage VM to check snapshot present on sec disk
ssh_client = remoteSSHClient.remoteSSHClient(
ssh_client = remoteSSHClient(
self.services["mgmt_server"]["ipaddress"],
self.services["mgmt_server"]["port"],
self.services["mgmt_server"]["username"],
@ -606,7 +606,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["mount_dir"],
"mount %s/%s %s" % (
"mount -t nfs %s:/%s %s" % (
sec_storage_ip,
export_path,
self.services["mount_dir"]
@ -686,7 +686,7 @@ class TestAccountSnapshotClean(cloudstackTestCase):
try:
cmds = [
"mount %s/%s %s" % (
"mount -t %s:/%s %s" % (
sec_storage_ip,
export_path,
self.services["mount_dir"]
@ -961,7 +961,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
try:
# Login to Management server to check snapshot present on
# sec disk
ssh_client = remoteSSHClient.remoteSSHClient(
ssh_client = remoteSSHClient(
self.services["mgmt_server"]["ipaddress"],
self.services["mgmt_server"]["port"],
self.services["mgmt_server"]["username"],
@ -970,7 +970,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["mount_dir"],
"mount %s/%s %s" % (
"mount -t nfs %s:/%s %s" % (
sec_storage_ip,
export_path,
self.services["mount_dir"]
@ -1210,7 +1210,7 @@ class TestSnapshotLimit(cloudstackTestCase):
# Export path: export/test
try:
# Login to VM to check snapshot present on sec disk
ssh_client = remoteSSHClient.remoteSSHClient(
ssh_client = remoteSSHClient(
self.services["mgmt_server"]["ipaddress"],
self.services["mgmt_server"]["port"],
self.services["mgmt_server"]["username"],
@ -1219,7 +1219,7 @@ class TestSnapshotLimit(cloudstackTestCase):
cmds = [
"mkdir -p %s" % self.services["mount_dir"],
"mount %s/%s %s" % (
"mount -t %s:/%s %s" % (
sec_storage_ip,
export_path,
self.services["mount_dir"]