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

CLOUDSTACK-7388: removed host credentials in the services dict.

This commit is contained in:
SrikanteswaraRao Talluri 2014-09-04 17:26:51 +05:30
parent aa64d8b3e7
commit 3d369de6fe
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/integration/component/maint/test_redundant_router.py
View File

@ -94,11 +94,6 @@ class Services:
},
},
},
"host": {
"username": "root",
"password": "password",
"publicport": 22,
},
"network": {
"name": "Test Network",
"displaytext": "Test Network",
@ -854,15 +849,21 @@ class TestRVRInternals(cloudstackTestCase):
hypervisor=self.hypervisor
)
else:
result = get_process_status(
master_host.ipaddress,
self.services['host']["publicport"],
self.services['host']["username"],
self.services['host']["password"],
master_router.linklocalip,
'ip addr show eth2'
try:
host = {}
host.user, host.passwd = get_host_credentials(self.config, master_host.ipaddress)
result = get_process_status(
master_host.ipaddress,
22,
host.user,
host.passwd,
master_router.linklocalip,
"ip addr show eth2"
)
except KeyError:
self.skipTest("Marvin configuration has no host credentials to check router services")
res = str(result)
self.debug("Command 'ip addr show eth2': %s" % result)
@ -890,14 +891,21 @@ class TestRVRInternals(cloudstackTestCase):
hypervisor=self.hypervisor
)
else:
result = get_process_status(
backup_host.ipaddress,
self.services['host']["publicport"],
self.services['host']["username"],
self.services['host']["password"],
backup_router.linklocalip,
'ip addr show eth2',
try:
host = {}
host.user, host.passwd = get_host_credentials(self.config, backup_host.ipaddress)
result = get_process_status(
master_host.ipaddress,
22,
host.user,
host.passwd,
backup_router.linklocalip,
"ip addr show eth2"
)
except KeyError:
self.skipTest("Marvin configuration has no host credentials to check router services")
res = str(result)
self.debug("Command 'ip addr show eth2': %s" % result)