X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDUTSetup.py;h=a0a48708b77e5ce8645eb97c9e3622edb314c082;hp=76f76aef7e2859bc9264aad8718287d1c4087feb;hb=c478afc5aec0161cc66e837c1ab919542b68ebbc;hpb=33499c81c94c2d3baef9d3e9f061cd76ef86fa74

diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py
index 76f76aef7e..a0a48708b7 100644
--- a/resources/libraries/python/DUTSetup.py
+++ b/resources/libraries/python/DUTSetup.py
@@ -10,23 +10,39 @@
 # 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):
+from resources.libraries.python.topology import NodeType
+from resources.libraries.python.ssh import SSH
+from resources.libraries.python.constants import Constants
 
-    def __init__(self):
-        pass
 
-    def setup_all_duts(self, nodes):
+class DUTSetup(object):
+    @staticmethod
+    def start_vpp_service_on_all_duts(nodes):
+        """Start up the VPP service on all nodes."""
+        ssh = SSH()
+        for node in nodes.values():
+            if node['type'] == NodeType.DUT:
+                ssh.connect(node)
+                (ret_code, stdout, stderr) = \
+                    ssh.exec_command_sudo('service vpp restart')
+                if 0 != int(ret_code):
+                    logger.debug('stdout: {0}'.format(stdout))
+                    logger.debug('stderr: {0}'.format(stderr))
+                    raise Exception('DUT {0} failed to start VPP service'.
+                                    format(node['host']))
+
+    @staticmethod
+    def setup_all_duts(nodes):
         """Prepare all DUTs in given topology for test execution."""
         for node in nodes.values():
             if node['type'] == NodeType.DUT:
-                self.setup_dut(node)
+                DUTSetup.setup_dut(node)
 
-    def setup_dut(self, node):
+    @staticmethod
+    def setup_dut(node):
         ssh = SSH()
         ssh.connect(node)
 
@@ -34,8 +50,9 @@ 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.error('DUT {0} setup script failed: "{1}"'.
-                    format(node['host'], stdout + stderr))
+            logger.debug('DUT {0} setup script failed: "{1}"'.
+                         format(node['host'], stdout + stderr))
             raise Exception('DUT test setup script failed at node {}'.
-                    format(node['host']))
+                            format(node['host']))