Skip to content

Commit f893a80

Browse files
author
SrikanteswaraRao Talluri
committed
Modified remoteSSHClient references to SshClient
1 parent 86976fb commit f893a80

7 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎tools/marvin/marvin/integration/lib/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#Import Local Modules
2121
from marvin.cloudstackAPI import *
22-
from marvin.remoteSSHClient import remoteSSHClient
22+
from marvin.sshClient import SshClient
2323
from utils import *
2424
from base import *
2525
from marvin.codes import PASS
@@ -217,7 +217,7 @@ def download_systemplates_sec_storage(server, services):
217217

218218
try:
219219
# Login to management server
220-
ssh = remoteSSHClient(
220+
ssh = SshClient(
221221
server["ipaddress"],
222222
server["port"],
223223
server["username"],

‎tools/marvin/marvin/integration/lib/utils.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import urlparse
3030
import datetime
3131
from marvin.cloudstackAPI import *
32-
from marvin.remoteSSHClient import remoteSSHClient
32+
from marvin.sshClient import SshClient
3333
from marvin.codes import *
3434

3535

@@ -124,7 +124,7 @@ def is_server_ssh_ready(ipaddress, port, username, password, retries=20, retryin
124124
'''
125125

126126
try:
127-
ssh = remoteSSHClient(
127+
ssh = SshClient(
128128
host=ipaddress,
129129
port=port,
130130
user=username,
@@ -190,7 +190,7 @@ def get_process_status(hostip, port, username, password, linklocalip, process, h
190190
"""Double hop and returns a process status"""
191191

192192
#SSH to the machine
193-
ssh = remoteSSHClient(hostip, port, username, password)
193+
ssh = SshClient(hostip, port, username, password)
194194
if str(hypervisor).lower() == 'vmware':
195195
ssh_command = "ssh -i /var/cloudstack/management/.ssh/id_rsa -ostricthostkeychecking=no "
196196
else:
@@ -296,7 +296,7 @@ def is_snapshot_on_nfs(apiclient, dbconn, config, zoneid, snapshotid):
296296
mgtSvr, user, passwd = config.mgtSvr[0].mgtSvrIp, config.mgtSvr[0].user, config.mgtSvr[0].passwd
297297

298298
try:
299-
ssh_client = remoteSSHClient(
299+
ssh_client = SshClient(
300300
mgtSvr,
301301
22,
302302
user,

‎tools/marvin/marvin/sandbox/demo/live/testSshDeployVM.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import marvin
2222
from marvin.cloudstackTestCase import *
23-
from marvin.remoteSSHClient import remoteSSHClient
23+
from marvin.sshClient import SshClient
2424

2525

2626
@UserName('demo', 'ROOT', '0')
@@ -84,7 +84,7 @@ def test_DeployVm(self):
8484

8585
# SSH login and compare hostname
8686
self.debug("Attempting to SSH into %s over %s of %s"%(nattedip, "22", vm.name))
87-
ssh_client = remoteSSHClient(nattedip, "22", "root", "password")
87+
ssh_client = SshClient(nattedip, "22", "root", "password")
8888
stdout = ssh_client.execute("hostname")
8989

9090
self.assertEqual(hostname, stdout[0], "cloudstack VM name and hostname \

‎tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/common.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#Import Local Modules
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
25-
import marvin.remoteSSHClient
25+
import marvin.sshClient
2626
from utils import *
2727
from base import *
2828

@@ -102,7 +102,7 @@ def download_systemplates_sec_storage(server, services):
102102

103103
try:
104104
# Login to management server
105-
ssh = marvin.remoteSSHClient.remoteSSHClient(
105+
ssh = marvin.sshClient.SshClient(
106106
server["ipaddress"],
107107
server["port"],
108108
server["username"],

‎tools/marvin/marvin/sandbox/demo/simulator/testcase/libs/utils.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"""
2121

2222
import time
23-
import marvin.remoteSSHClient
23+
import marvin.sshClient
2424
from marvin.cloudstackAPI import *
2525
import marvin.cloudstackConnection
26-
from marvin.remoteSSHClient import remoteSSHClient
26+
from marvin.sshClient import SshClient
2727
#from marvin.cloudstackConnection import cloudConnection
2828
import marvin.configGenerator
2929
import logging
@@ -44,7 +44,7 @@ def is_server_ssh_ready(ipaddress, port, username, password, retries=50):
4444
loop_cnt = retries
4545
while True:
4646
try:
47-
ssh = marvin.remoteSSHClient.remoteSSHClient(
47+
ssh = marvin.sshClient.SshClient(
4848
ipaddress,
4949
port,
5050
username,
@@ -89,7 +89,7 @@ def get_process_status(hostip, port, username, password, linklocalip, process):
8989
"""Double hop and returns a process status"""
9090

9191
#SSH to the machine
92-
ssh = marvin.remoteSSHClient.remoteSSHClient(
92+
ssh = marvin.sshClient.SshClient(
9393
hostip,
9494
port,
9595
username,

‎tools/marvin/marvin/sandbox/demo/simulator/testcase/test_vm_life_cycle.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import marvin
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
25-
from marvin.remoteSSHClient import remoteSSHClient
25+
from marvin.sshClient import SshClient
2626

2727
from testcase.libs.utils import *
2828
from testcase.libs.base import *

‎tools/marvin/marvin/sshClient.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,5 +178,5 @@ def close(self):
178178

179179
if __name__ == "__main__":
180180
with contextlib.closing(SshClient("10.223.75.10", 22, "root",
181-
"password")) as ssh:
181+
"password")) as ssh:
182182
print ssh.execute("ls -l")

0 commit comments

Comments
 (0)