diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2016-10-18 12:18:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-18 12:18:27 +0000 |
| commit | 7bae8ffe122b7d62eae03a2393182342f1f8fe85 (patch) | |
| tree | 2640ec0c9b81effeacb76f401668935f5e418096 /vnfs/qemu/qemu.py | |
| parent | 8b0cb90e2c27d25729f8ad527a18a38db11e3073 (diff) | |
| parent | c0061038f0dda5f1cfb7341820b12f5cff056097 (diff) | |
Merge "testpmd: Simplify GUEST's testpmd configuration"
Diffstat (limited to 'vnfs/qemu/qemu.py')
| -rw-r--r-- | vnfs/qemu/qemu.py | 45 |
1 files changed, 5 insertions, 40 deletions
diff --git a/vnfs/qemu/qemu.py b/vnfs/qemu/qemu.py index ae0056dc..67dbfab4 100644 --- a/vnfs/qemu/qemu.py +++ b/vnfs/qemu/qemu.py @@ -401,48 +401,13 @@ class IVnfQemu(IVnf): self.execute_and_wait('make clean') self.execute_and_wait('make') - # get multi-queue settings from CLI - guest_testpmd_txq = int(get_test_param('guest_testpmd_txq', 0)) - if guest_testpmd_txq: - override_list = [guest_testpmd_txq] * (self._number + 1) - S.setValue('GUEST_TESTPMD_TXQ', override_list) - - guest_testpmd_rxq = int(get_test_param('guest_testpmd_rxq', 0)) - if guest_testpmd_rxq: - override_list = [guest_testpmd_rxq] * (self._number + 1) - S.setValue('GUEST_TESTPMD_RXQ', override_list) - - guest_testpmd_nb_cores = \ - int(get_test_param('guest_testpmd_nb_cores', 0)) - if guest_testpmd_nb_cores: - override_list = [guest_testpmd_nb_cores] * (self._number + 1) - S.setValue('GUEST_TESTPMD_NB_CORES', override_list) - - guest_testpmd_cpu_mask = \ - int(get_test_param('guest_testpmd_cpu_mask', 0)) - if guest_testpmd_cpu_mask: - override_list = [guest_testpmd_cpu_mask] * (self._number + 1) - S.setValue('GUEST_TESTPMD_CPU_MASK', override_list) + # get testpmd settings from CLI + testpmd_params = get_test_param('guest_testpmd_params', + S.getValue('GUEST_TESTPMD_PARAMS')[self._number]) - if int(S.getValue('GUEST_NIC_QUEUES')[self._number]): - self.execute_and_wait( - './testpmd {} -n4 --socket-mem 512 --'.format( - S.getValue('GUEST_TESTPMD_CPU_MASK')[self._number]) + - ' --burst=64 -i --txqflags=0xf00 ' + - '--nb-cores={} --rxq={} --txq={} '.format( - S.getValue('GUEST_TESTPMD_NB_CORES')[self._number], - S.getValue('GUEST_TESTPMD_TXQ')[self._number], - S.getValue('GUEST_TESTPMD_RXQ')[self._number]) + - '--disable-hw-vlan', 60, "Done") - else: - self.execute_and_wait( - './testpmd {} -n 4 --socket-mem 512 --'.format( - S.getValue('GUEST_TESTPMD_CPU_MASK')[self._number]) + - ' --burst=64 -i --txqflags=0xf00 ' + - '--disable-hw-vlan', 60, "Done") + self.execute_and_wait( './testpmd {}'.format(testpmd_params), 60, "Done") self.execute('set fwd ' + self._testpmd_fwd_mode, 1) - self.execute_and_wait('start', 20, - 'TX RS bit threshold=.+ - TXQ flags=0xf00') + self.execute_and_wait('start', 20, 'testpmd>') def _configure_l2fwd(self): """ |