X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDPDK%2FDPDKTools.py;h=83ddae8b4ae809bb150d18ee06e16d6c3d6c23ac;hp=b403c3a5f9279ab277e68bbd4410e491e3896b87;hb=01d8f262afc567c3d49a23c3cb2cdeaced8a6887;hpb=cca05a55f3434d8a031b98f4a496adb8df20c122

diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py
index b403c3a5f9..83ddae8b4a 100644
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.py
@@ -79,6 +79,25 @@ class DPDKTools:
             message = u"Cleanup the DPDK failed!"
             exec_cmd_no_error(node, command, timeout=1200, message=message)
 
+    @staticmethod
+    def get_dpdk_version(node):
+        """Log and return the installed DPDK version.
+
+        The logged string ends with newline, the returned one is stripped.
+
+        :param node: Node from topology file.
+        :type node: dict
+        :returns: Stripped DPDK version string.
+        :rtype: str
+        :raises RuntimeError: If command returns nonzero return code.
+        """
+        command = f"cat {Constants.REMOTE_FW_DIR}/dpdk*/VERSION"
+        message = u"Get DPDK version failed!"
+        stdout, _ = exec_cmd_no_error(node, command, message=message)
+        # TODO: PAL should already tolerate stripped value in the log.
+        logger.info(f"DPDK Version: {stdout}")
+        return stdout.strip()
+
     @staticmethod
     def install_dpdk_framework(node):
         """
@@ -92,12 +111,7 @@ class DPDKTools:
             f"/entry/install_dpdk.sh"
         message = u"Install the DPDK failed!"
         exec_cmd_no_error(node, command, timeout=3600, message=message)
-
-        command = f"cat {Constants.REMOTE_FW_DIR}/dpdk*/VERSION"
-        message = u"Get DPDK version failed!"
-        stdout, _ = exec_cmd_no_error(node, command, message=message)
-
-        logger.info(f"DPDK Version: {stdout}")
+        DPDKTools.get_dpdk_version(node)
 
     @staticmethod
     def install_dpdk_framework_on_all_duts(nodes):