From: wu.zhihui Date: Thu, 13 Oct 2016 06:52:13 +0000 (+0800) Subject: update known_hosts path in ssh_test() X-Git-Tag: danube.1.0~252 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F23073%2F2;p=qtip.git update known_hosts path in ssh_test() In qtip container, env HOME is changed to /home/opnfv. '~/.ssh/known_hosts' need be specified to '/root/.ssh/known_hosts' in ssh_test(). Change-Id: I902699164c0fb6a06e0253020bf701e206cfd166 Signed-off-by: wu.zhihui --- diff --git a/func/env_setup.py b/func/env_setup.py index ca83f040..2655fab9 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -58,12 +58,12 @@ class Env_setup: @staticmethod 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) + logger.info('Beginning SSH Test: %s \n' % ip) + os.system('ssh-keyscan %s >> /root/.ssh/known_hosts' % ip) time.sleep(2) ssh_cmd = './data/qtip_creds.sh %s' % ip - print "run command: %s " % ssh_cmd + logger.info("run command: %s " % ssh_cmd) os.system(ssh_cmd) ssh = paramiko.SSHClient() @@ -74,13 +74,13 @@ class Env_setup: try: stdin, stdout, stderr = ssh.exec_command('uname') if not stderr.readlines(): - print('SSH successful') + logger.info('SSH successful') break except socket.error: - print 'SSH is still unavailable, retry!' + logger.error('SSH is still unavailable, retry!') time.sleep(2) if attempts == 99: - print "Try 99 times, SSH failed: %s" % ip + logger.error("Try 99 times, SSH failed: %s" % ip) @staticmethod def ping_test(lister, attempts=30):