summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwu.zhihui <wu.zhihui1@zte.com.cn>2016-08-31 13:11:59 +0800
committerwu.zhihui <wu.zhihui1@zte.com.cn>2016-08-31 13:18:03 +0800
commit03a928018ee50a06f1a05c7bb31b7eecec8061bc (patch)
tree5430019a6555f67ad8616979c998e572d0e0d1ea
parent3950a609b6332f0a25f5d8298ad6571809912f76 (diff)
correct error code and cleanup duplicated code in ssh_test()
Change-Id: I6d7f598b7b8d2dbb987f0c82abb9831b2fd782a5 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
-rw-r--r--func/env_setup.py67
1 files changed, 23 insertions, 44 deletions
diff --git a/func/env_setup.py b/func/env_setup.py
index ea49337d..96f984cb 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -57,52 +57,31 @@ class Env_setup:
f_name_2.close()
@staticmethod
- def ssh_test(lister):
- print 'list: ', lister
- for k, v in lister:
- ip_var = k
- print '\nBeginning SSH Test!\n'
- if v != '':
- print ('\nSSH->>>>> {0} {1}\n'.format(k, v))
- time.sleep(2)
-
- ssh_c = 'ssh-keyscan {0} >> ~/.ssh/known_hosts'.format(k)
- os.system(ssh_c)
- ssh_cmd = './data/qtip_creds.sh {0}'.format(ip_var)
- print ssh_cmd
- os.system(ssh_cmd)
- for infinity in range(100):
- try:
- ssh = paramiko.SSHClient()
- ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
- ssh.connect(k, key_filename='./data/QtipKey')
- stdin, stdout, stderr = ssh.exec_command('ls')
+ def ssh_test(hosts):
+ for ip, pw in hosts:
+ print '\nBeginning SSH Test: %s \n' % ip
+ os.system('ssh-keyscan %s >> ~/.ssh/known_hosts' % ip)
+ time.sleep(2)
+
+ ssh_cmd = './data/qtip_creds.sh %s' % ip
+ print "run command: %s " % ssh_cmd
+ os.system(ssh_cmd)
+
+ ssh = paramiko.SSHClient()
+ ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+ ssh.connect(ip, key_filename='./data/QtipKey')
+
+ for attempts in range(100):
+ try:
+ stdin, stdout, stderr = ssh.exec_command('uname')
+ if not stderr.readlines():
print('SSH successful')
- for line in stdout:
- print '... ' + line.strip('\n')
break
- except socket.error:
- print 'Retrying aSSH %s' % infinity
- time.sleep(1)
- if v == '':
- print ('SSH->>>>>', k)
- ssh_c = 'ssh-keyscan {0} >> ~/.ssh/known_hosts'.format(k)
-
- time.sleep(3)
- os.system(ssh_c)
-
- for infinity in range(10):
- try:
- ssh = paramiko.SSHClient()
- ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
- ssh.connect(k, key_filename='./data/QtipKey')
- stdin, stdout, stderr = ssh.exec_command('ls')
- print('SSH successful')
- for line in stdout:
- print '... ' + line.strip('\n')
- break
- except socket.error:
- print 'Retrying SSH %s' % infinity
+ except socket.error:
+ print 'SSH is still unavailable, retry!'
+ time.sleep(2)
+ if attempts == 99:
+ print "Try 99 times, SSH failed: %s" % ip
@staticmethod
def ping_test(lister, attempts=30):