PAL: Get DPDK version from output_info.xml 79/21379/1
authorTibor Frank <tifrank@cisco.com>
Mon, 19 Aug 2019 11:02:56 +0000 (13:02 +0200)
committerTibor Frank <tifrank@cisco.com>
Mon, 19 Aug 2019 11:02:56 +0000 (13:02 +0200)
Change-Id: I922c8143df39025cc0a78047f3cef7b9f5673b4b
Signed-off-by: Tibor Frank <tifrank@cisco.com>
resources/tools/presentation/input_data_parser.py

index 25e258f..bbbf0a9 100644 (file)
@@ -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