X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO-plugin%2Fosm_ro_plugin%2Fvimconn.py;h=312c307a91de7e1053a1819ec765117d3df1ef54;hp=0b7801321728b659cbe1e4a39a6571945d51eab9;hb=1c21a746c7290ecb839a5d03c7573349d2a5dec4;hpb=5a764c6900be9e0ec8d761b06d241af60f58ab29 diff --git a/RO-plugin/osm_ro_plugin/vimconn.py b/RO-plugin/osm_ro_plugin/vimconn.py index 0b780132..312c307a 100644 --- a/RO-plugin/osm_ro_plugin/vimconn.py +++ b/RO-plugin/osm_ro_plugin/vimconn.py @@ -33,6 +33,7 @@ from io import StringIO import logging import socket import sys +import traceback import warnings import paramiko @@ -766,32 +767,32 @@ class VimConnector: client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) client.connect( - ip_addr, username=user, password=password, pkey=pkey, timeout=10 + ip_addr, username=user, password=password, pkey=pkey, timeout=30 ) for command in commands: - (i, o, e) = client.exec_command(command, timeout=10) + (i, o, e) = client.exec_command(command, timeout=30) returncode = o.channel.recv_exit_status() outerror = e.read() if returncode != 0: text = "run_command='{}' Error='{}'".format(command, outerror) + self.logger.debug(traceback.format_tb(e.__traceback__)) raise VimConnUnexpectedResponse( "Cannot inject ssh key in VM: '{}'".format(text) ) - return except ( socket.error, paramiko.AuthenticationException, paramiko.SSHException, ) as message: + self.logger.debug(traceback.format_exc()) raise VimConnUnexpectedResponse( "Cannot inject ssh key in VM: '{}' - {}".format( ip_addr, str(message) ) ) - return # Optional methods