From c093f3f8a6c116c1897bb5f6793e99111ddb0682 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 19 Aug 2019 13:02:56 +0200 Subject: PAL: Get DPDK version from output_info.xml Change-Id: I922c8143df39025cc0a78047f3cef7b9f5673b4b Signed-off-by: Tibor Frank (cherry picked from commit 039a71a97592cfb864dff8fc56ec04b33f8f92bb) --- resources/tools/presentation/input_data_parser.py | 4 ++-- 1 file 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 -- cgit 1.2.3-korg