Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
PAL: Get DPDK Version
[csit.git]
/
resources
/
libraries
/
python
/
DPDK
/
DPDKTools.py
diff --git
a/resources/libraries/python/DPDK/DPDKTools.py
b/resources/libraries/python/DPDK/DPDKTools.py
index
25d2217
..
b6c351f
100644
(file)
--- 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."""
"""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
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)
"""
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):
@staticmethod
def install_dpdk_test_on_all_duts(nodes):