From 05eba892c7d2a778e78a950966fb1a6e0d68aa60 Mon Sep 17 00:00:00 2001 From: Matej Klotton Date: Thu, 3 Mar 2016 17:49:13 +0100 Subject: Update VPP version downloaded from Nexus. Change-Id: Iae2ee6d576347262d9f3f9a9e9b9cc65dbc5bf5e Signed-off-by: Matej Klotton --- resources/libraries/python/DUTSetup.py | 6 +++--- resources/libraries/python/ssh.py | 28 ++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index e5e56784d5..d5ebf9a069 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -10,15 +10,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from robot.api import logger from topology import NodeType from ssh import SSH from constants import Constants -class DUTSetup(object): - def __init__(self): - pass +class DUTSetup(object): def start_vpp_service_on_all_duts(self, nodes): """Start up the VPP service on all nodes.""" @@ -48,6 +47,7 @@ class DUTSetup(object): ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.format( Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH)) logger.trace(stdout) + logger.trace(stderr) if 0 != int(ret_code): logger.debug('DUT {0} setup script failed: "{1}"'. format(node['host'], stdout + stderr)) diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py index a2bb9b1dc4..2de6f4a36e 100644 --- a/resources/libraries/python/ssh.py +++ b/resources/libraries/python/ssh.py @@ -18,6 +18,7 @@ from time import time from robot.api import logger from interruptingcow import timeout from robot.utils.asserts import assert_equal, assert_not_equal +from socket import timeout as socket_timeout __all__ = ["exec_cmd", "exec_cmd_no_error"] @@ -72,7 +73,7 @@ class SSH(object): Returns (return_code, stdout, stderr). """ logger.trace('exec_command on {0}: {1}' - .format(self._ssh.get_transport().getpeername(), cmd)) + .format(self._ssh.get_transport().getpeername(), cmd)) start = time() chan = self._ssh.get_transport().open_session() if timeout is not None: @@ -84,22 +85,33 @@ class SSH(object): stdout = "" while True: - buf = chan.recv(self.__MAX_RECV_BUF) - stdout += buf - if not buf: + try: + buf = chan.recv(self.__MAX_RECV_BUF) + stdout += buf + if not buf: + break + except socket_timeout: + logger.trace('Channels stdout timeout occurred') break stderr = "" while True: - buf = chan.recv_stderr(self.__MAX_RECV_BUF) - stderr += buf - if not buf: + try: + buf = chan.recv_stderr(self.__MAX_RECV_BUF) + stderr += buf + if not buf: + break + except socket_timeout: + logger.trace('Channels stderr timeout occurred') break return_code = chan.recv_exit_status() logger.trace('chan_recv/_stderr took {} seconds'.format(time()-end)) - return (return_code, stdout, stderr) + logger.trace('return RC {}'.format(return_code)) + logger.trace('return STDOUT {}'.format(stdout)) + logger.trace('return STDERR {}'.format(stderr)) + return return_code, stdout, stderr def exec_command_sudo(self, cmd, cmd_input=None, timeout=10): """Execute SSH command with sudo on a new channel on the connected Node. -- cgit 1.2.3-korg