From 75e2e7bbbfc1da40f8c742870ec12204846c9bf9 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 16 Jan 2019 07:18:02 +0000 Subject: CSIT-1403 Implement multichain configuration for l2bd with memif/ip4. Change-Id: Ia87156b2ba826eb0a9a93d756b9765c7373ca6ce Signed-off-by: Peter Mikus --- resources/libraries/python/DUTSetup.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'resources/libraries/python/DUTSetup.py') diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 7a28e09527..c573985a9b 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -606,7 +606,8 @@ class DUTSetup(object): :raises RuntimeError: If failed to remove or install VPP. """ for node in nodes.values(): - message='Failed to install VPP on {host}!'.format(host=node['host']) + message = 'Failed to install VPP on host {host}!'.\ + format(host=node['host']) if node['type'] == NodeType.DUT: command = '. /etc/lsb-release; echo "${DISTRIB_ID}"' stdout, _ = exec_cmd_no_error(node, command) @@ -615,15 +616,15 @@ class DUTSetup(object): exec_cmd_no_error(node, 'apt-get purge -y "*vpp*" || true', timeout=120, sudo=True) exec_cmd_no_error(node, 'dpkg -i --force-all {dir}*.deb'. - format(dir=vpp_pkg_dir), timeout=120, sudo=True, - message=message) + format(dir=vpp_pkg_dir), timeout=120, + sudo=True, message=message) exec_cmd_no_error(node, 'dpkg -l | grep vpp', sudo=True) else: exec_cmd_no_error(node, 'yum -y remove "*vpp*" || true', timeout=120, sudo=True) - exec_cmd_no_error(node, 'rpm -ivh {dir}*.rpm'.\ - format(dir=vpp_pkg_dir), timeout=120, sudo=True, - message=message) + exec_cmd_no_error(node, 'rpm -ivh {dir}*.rpm'. + format(dir=vpp_pkg_dir), timeout=120, + sudo=True, message=message) exec_cmd_no_error(node, 'rpm -qai *vpp*', sudo=True) @staticmethod -- cgit 1.2.3-korg