Upgrade T-rex to v2.22

[csit.git] / resources / libraries / python / DUTSetup.py

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 6b2f5ed..275a546 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -88,8 +88,9 @@ class DUTSetup(object):
         ssh.connect(node)
 
         (ret_code, stdout, stderr) = \
-            ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.format(
-                Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH), timeout=120)
+            ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.
+                             format(Constants.REMOTE_FW_DIR,
+                                    Constants.RESOURCES_LIB_SH), timeout=120)
         logger.trace(stdout)
         logger.trace(stderr)
         if int(ret_code) != 0:
@@ -118,14 +119,18 @@ class DUTSetup(object):
 
         if int(ret_code) != 0:
             logger.debug('Not possible to get PID of VPP process on node: '
-                         '"{1}"'.format(node['host'], stdout + stderr))
+                         '{0}\n {1}'.format(node['host'], stdout + stderr))
             raise RuntimeError('Not possible to get PID of VPP process on node:'
                                ' {}'.format(node['host']))
 
-        if len(stdout.splitlines()) != 1:
+        if len(stdout.splitlines()) == 1:
+            return int(stdout)
+        elif len(stdout.splitlines()) == 0:
+            raise RuntimeError("No VPP PID found on node {0}".
+                               format(node['host']))
+        else:
             raise RuntimeError("More then one VPP PID found on node {0}".
                                format(node['host']))
-        return int(stdout)
 
     @staticmethod
     def get_vpp_pids(nodes):