From 8c12ff59f1a5e750151f5eb0e806dcc80e91c3c2 Mon Sep 17 00:00:00 2001 From: Matej Klotton Date: Thu, 24 Mar 2016 16:14:20 +0100 Subject: Reformat python libraries. PEP8 reformat fix typos docstrings reformat Change-Id: Ic48ba4e06490630808b8e2ab1ab0b046ec7eeed7 Signed-off-by: Matej Klotton --- resources/libraries/python/DUTSetup.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'resources/libraries/python/DUTSetup.py') diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index d5ebf9a069..a0a48708b7 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -12,34 +12,37 @@ # limitations under the License. from robot.api import logger -from topology import NodeType -from ssh import SSH -from constants import Constants +from resources.libraries.python.topology import NodeType +from resources.libraries.python.ssh import SSH +from resources.libraries.python.constants import Constants -class DUTSetup(object): - def start_vpp_service_on_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') + 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'])) + format(node['host'])) - def setup_all_duts(self, nodes): + @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) @@ -50,6 +53,6 @@ class DUTSetup(object): logger.trace(stderr) if 0 != int(ret_code): logger.debug('DUT {0} setup script failed: "{1}"'. - format(node['host'], stdout + stderr)) + format(node['host'], stdout + stderr)) raise Exception('DUT test setup script failed at node {}'. - format(node['host'])) + format(node['host'])) -- cgit 1.2.3-korg