diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2015-09-25 18:00:17 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2015-10-07 14:53:13 +0000 |
| commit | 89e23da8e473387b2e6cb37a2b882d2d3c68655c (patch) | |
| tree | 41bd86bc1447bf9bcbfa33cd95f175c258ede9d7 /tools/tasks.py | |
| parent | 1550b638fca662c5e68556702ff0316c3fc9562c (diff) | |
Enable PVVP deployment for DPDK Vhost User and Vhost Cuse
Generic PVVP deployment support has been added. Two
new testcase scenarios for throughput and back2back
tests with PVVP deployment were added. Original
implementation of PVP has been refactored
Following files were affected:
modified: conf/01_testcases.conf
modified: conf/02_vswitch.conf
modified: conf/04_vnf.conf
modified: core/__init__.py
modified: core/component_factory.py
modified: core/loader/loader_servant.py
modified: core/vnf_controller.py
deleted: core/vnf_controller_p2p.py
deleted: core/vnf_controller_pvp.py
modified: core/vswitch_controller_p2p.py
modified: core/vswitch_controller_pvp.py
new file: core/vswitch_controller_pvvp.py
modified: docs/to-be-reorganized/NEWS.rst
modified: docs/to-be-reorganized/quickstart.rst
modified: src/dpdk/dpdk.py
modified: src/ovs/ofctl.py
modified: testcases/testcase.py
modified: tools/tasks.py
new file: vnfs/qemu/qemu.py
new file: vnfs/qemu/qemu_dpdk.py
modified: vnfs/qemu/qemu_dpdk_vhost_cuse.py
modified: vnfs/qemu/qemu_dpdk_vhost_user.py
modified: vnfs/vnf/vnf.py
modified: vswitches/ovs_dpdk_vhost.py
Change-Id: Ib6869a29337a184cb58c57fd96bba1183aba00ab
JIRA: VSPERF-68, VSPERF-69
Signed-off-by: Martin Klozik (martinx.klozik@intel.com)
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'tools/tasks.py')
| -rw-r--r-- | tools/tasks.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/tasks.py b/tools/tasks.py index 555a5929..33a5931a 100644 --- a/tools/tasks.py +++ b/tools/tasks.py @@ -241,14 +241,17 @@ class Process(object): self.kill() raise exc - def kill(self): + def kill(self, signal='-15', sleep=2): """Kill process instance if it is alive. + + :param signal: signal to be sent to the process + :param sleep: delay in seconds after signal is sent """ if self._child and self._child.isalive(): - run_task(['sudo', 'kill', '-15', str(self._child.pid)], + run_task(['sudo', 'kill', signal, str(self._child.pid)], self._logger) self._logger.debug('Wait for process to terminate') - time.sleep(2) + time.sleep(sleep) if self.is_relinquished(): self._relinquish_thread.join() |