From 481c98ddaaaee4559977b0d601083391a44f1a18 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 13 Aug 2019 14:18:32 +0200 Subject: PAL: Get DPDK Version - Needed for trending Change-Id: I3d576e39d6e3b91821050fbd4a8a95380275797b Signed-off-by: Tibor Frank (cherry picked from commit 9e1bb28404a23f6d4c62fb945a3ee6dba42f1c47) --- resources/libraries/python/DPDK/DPDKTools.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py index 25d221772c..b6c351f3c2 100644 --- a/resources/libraries/python/DPDK/DPDKTools.py +++ b/resources/libraries/python/DPDK/DPDKTools.py @@ -14,7 +14,9 @@ """This module implements initialization and cleanup of DPDK environment.""" -from resources.libraries.python.ssh import SSH +from robot.api import logger + +from resources.libraries.python.ssh import SSH, exec_cmd_no_error from resources.libraries.python.Constants import Constants from resources.libraries.python.topology import NodeType, Topology @@ -104,15 +106,17 @@ class DPDKTools(object): """ arch = Topology.get_node_arch(node) - ssh = SSH() - ssh.connect(node) + command = ('{fwdir}/tests/dpdk/dpdk_scripts/install_dpdk.sh {arch}'. + format(fwdir=Constants.REMOTE_FW_DIR, arch=arch)) + message = 'Install the DPDK failed!' + exec_cmd_no_error(node, command, timeout=600, message=message) - ret_code, _, _ = ssh.exec_command( - '{fwdir}/tests/dpdk/dpdk_scripts/install_dpdk.sh {arch}'. - format(fwdir=Constants.REMOTE_FW_DIR, arch=arch), timeout=600) + command = ('cat {fwdir}/download_dir/dpdk*/VERSION'. + format(fwdir=Constants.REMOTE_FW_DIR)) + message = 'Get DPDK version failed!' + stdout, _ = exec_cmd_no_error(node, command, message=message) - if ret_code != 0: - raise RuntimeError('Install the DPDK failed') + logger.info('DPDK Version: {version}'.format(version=stdout)) @staticmethod def install_dpdk_test_on_all_duts(nodes): -- cgit 1.2.3-korg