diff options
| -rwxr-xr-x | docs/userguide/yardstick.rst | 4 | ||||
| -rw-r--r-- | vnfs/qemu/qemu.py | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/userguide/yardstick.rst b/docs/userguide/yardstick.rst index ec306d57..18adbdbe 100755 --- a/docs/userguide/yardstick.rst +++ b/docs/userguide/yardstick.rst @@ -27,7 +27,7 @@ Yardstick Installation In order to run Yardstick testcases, you will need to prepare your test environment. Please follow the `installation instructions -<http://artifacts.opnfv.org/yardstick/brahmaputra/docs/user_guides_framework/index.html>`__ +<http://artifacts.opnfv.org/yardstick/docs/user_guides_framework/index.html>`__ to install the yardstick. Please note, that yardstick uses OpenStack for execution of testcases. @@ -161,7 +161,7 @@ Section runner ~~~~~~~~~~~~~~ Yardstick supports several `runner types -<http://artifacts.opnfv.org/yardstick/brahmaputra/docs/userguide/architecture.html#runner-types>`__. +<http://artifacts.opnfv.org/yardstick/docs/userguide/architecture.html#runner-types>`__. In case of vswitchperf specific TCs, **Sequence** runner type can be used to execute the testcase for given list of packet sizes. diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index a9343fd4..c9569ae6 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -251,14 +251,13 @@ class IVnfQemu(IVnf): :return: None """ self._logger.info('Affinitizing VHOST Net threads.') - args1 = ['ps', 'ax'] + args1 = ['pgrep', 'vhost-'] process1 = subprocess.Popen(args1, stdout=subprocess.PIPE, shell=False) out = process1.communicate()[0] - processes = list() - for line in out.decode(locale.getdefaultlocale()[1]).split('\n'): - if re.search('\[vhost-(\d+)', line): - processes.append(re.match('\s*(\d+)', line).group(1)) + processes = out.decode(locale.getdefaultlocale()[1]).split('\n') + if processes[-1] == '': + processes.pop() # pgrep may return an extra line with no data self._logger.info('Found %s vhost net threads...', len(processes)) cpumap = S.getValue('VSWITCH_VHOST_CPU_MAP') |