UTI: Export results

[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 9bb8996..83ddae8 100644 (file)
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -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):
         """
@@ -91,13 +110,8 @@ class DPDKTools:
         command = f"{Constants.REMOTE_FW_DIR}/{Constants.RESOURCES_LIB_SH}" \
             f"/entry/install_dpdk.sh"
         message = u"Install the DPDK failed!"
-        exec_cmd_no_error(node, command, timeout=600, 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}")
+        exec_cmd_no_error(node, command, timeout=3600, message=message)
+        DPDKTools.get_dpdk_version(node)
 
     @staticmethod
     def install_dpdk_framework_on_all_duts(nodes):