Increase timeout for 'vpp restart' operations

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

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index e2d183f..78caeb7 100644 (file)
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -11,6 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 # See the License for the specific language governing permissions and
 # limitations under the License.
 

+"""DUT setup library."""
+

 from robot.api import logger
 
 from resources.libraries.python.topology import NodeType
 from robot.api import logger
 
 from resources.libraries.python.topology import NodeType


@@ -20,6 +22,7 @@ from resources.libraries.python.VatExecutor import VatExecutor
 
 
 class DUTSetup(object):
 
 
 class DUTSetup(object):

+    """Contains methods for setting up DUTs."""

     @staticmethod
     def start_vpp_service_on_all_duts(nodes):
         """Start up the VPP service on all nodes."""
     @staticmethod
     def start_vpp_service_on_all_duts(nodes):
         """Start up the VPP service on all nodes."""


@@ -28,8 +31,8 @@ class DUTSetup(object):
             if node['type'] == NodeType.DUT:
                 ssh.connect(node)
                 (ret_code, stdout, stderr) = \
             if node['type'] == NodeType.DUT:
                 ssh.connect(node)
                 (ret_code, stdout, stderr) = \

-                    ssh.exec_command_sudo('service vpp restart')
-                if 0 != int(ret_code):
+                    ssh.exec_command_sudo('service vpp restart', timeout=120)
+                if int(ret_code) != 0:

                     logger.debug('stdout: {0}'.format(stdout))
                     logger.debug('stderr: {0}'.format(stderr))
                     raise Exception('DUT {0} failed to start VPP service'.
                     logger.debug('stdout: {0}'.format(stdout))
                     logger.debug('stderr: {0}'.format(stderr))
                     raise Exception('DUT {0} failed to start VPP service'.


@@ -74,15 +77,22 @@ class DUTSetup(object):
 
     @staticmethod
     def setup_dut(node):
 
     @staticmethod
     def setup_dut(node):

+        """Run script over SSH to setup the DUT node.
+
+        :param node: DUT node to set up.
+        :type node: dict
+
+        :raises Exception: If the DUT setup fails.
+        """

         ssh = SSH()
         ssh.connect(node)
 
         (ret_code, stdout, stderr) = \
             ssh.exec_command('sudo -Sn bash {0}/{1}/dut_setup.sh'.format(
         ssh = SSH()
         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))
+                Constants.REMOTE_FW_DIR, Constants.RESOURCES_LIB_SH), timeout=120)

         logger.trace(stdout)
         logger.trace(stderr)
         logger.trace(stdout)
         logger.trace(stderr)

-        if 0 != int(ret_code):
+        if int(ret_code) != 0:

             logger.debug('DUT {0} setup script failed: "{1}"'.
                          format(node['host'], stdout + stderr))
             raise Exception('DUT test setup script failed at node {}'.
             logger.debug('DUT {0} setup script failed: "{1}"'.
                          format(node['host'], stdout + stderr))
             raise Exception('DUT test setup script failed at node {}'.