aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2019-08-19 13:02:56 +0200
committerTibor Frank <tifrank@cisco.com>2019-08-19 11:05:14 +0000
commitc093f3f8a6c116c1897bb5f6793e99111ddb0682 (patch)
treeafe6f395d808339e89179a034e0e76e00955ef5c
parent82f1207a93cf59f332b2f422990918d57512aa02 (diff)
PAL: Get DPDK version from output_info.xml
Change-Id: I922c8143df39025cc0a78047f3cef7b9f5673b4b Signed-off-by: Tibor Frank <tifrank@cisco.com> (cherry picked from commit 039a71a97592cfb864dff8fc56ec04b33f8f92bb)
-rw-r--r--resources/tools/presentation/input_data_parser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py
index 25e258f75a..bbbf0a9ae0 100644
--- a/resources/tools/presentation/input_data_parser.py
+++ b/resources/tools/presentation/input_data_parser.py
@@ -281,7 +281,7 @@ class ExecutionChecker(ResultVisitor):
REGEX_VERSION_VPP = re.compile(r"(return STDOUT Version:\s*|"
r"VPP Version:\s*|VPP version:\s*)(.*)")
- REGEX_VERSION_DPDK = re.compile(r"DPDK Version: (\d*.\d*)")
+ REGEX_VERSION_DPDK = re.compile(r"(DPDK version:\s*|DPDK Version:\s*)(.*)")
REGEX_TCP = re.compile(r'Total\s(rps|cps|throughput):\s([0-9]*).*$')
@@ -425,7 +425,7 @@ class ExecutionChecker(ResultVisitor):
if msg.message.count("DPDK Version:"):
try:
self._version = str(re.search(
- self.REGEX_VERSION_DPDK, msg.message). group(1))
+ self.REGEX_VERSION_DPDK, msg.message). group(2))
self._data["metadata"]["version"] = self._version
except IndexError:
pass