From: Christian Trautman <ctrautma@redhat.com>
Date: Tue, 9 Oct 2018 17:29:11 +0000 (-0400)
Subject: qemu_regex_fix: Regex change for future qemu versions info cpu
X-Git-Tag: opnfv-7.0.0~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=bc569ef41ec4120ee63bfa43c2b647cd96957ccb;p=vswitchperf.git

qemu_regex_fix: Regex change for future qemu versions info cpu

When running info cpus command on qemu newer versions of 2.12
the output has changed. This is causing the regex lookup for
the thread match to affinitize the PID to the correct CPU.

JIRA: VSPERF-592

Change-Id: Ie3a4490f3f8da1e4df00c7095cf1f05fdd939e07
Signed-off-by: Christian Trautman <ctrautma@redhat.com>
---

diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py
index 7ba58c05..d3e1b343 100644
--- a/vnfs/qemu/qemu.py
+++ b/vnfs/qemu/qemu.py
@@ -210,7 +210,7 @@ class IVnfQemu(IVnf):
 
         :returns: None
         """
-        thread_id = (r'.* CPU #%d: .* thread_id=(\d+)')
+        thread_id = (r'.* CPU #%d:.*? thread_id=(\d+)')
 
         self._logger.info('Affinitizing guest...')