From d2a7114de8c307c152b119d2c153e1d75df78b65 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 9 Jul 2019 14:28:27 +0000 Subject: Aligning FUNC/PERF keywords - Data driven Change-Id: I233c8908c724556db09c60de6efa9237068fb4c3 Signed-off-by: Peter Mikus --- resources/libraries/robot/shared/default.robot | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'resources/libraries/robot/shared/default.robot') diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 86e124ad62..57ee1797af 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -160,7 +160,8 @@ | | | ${cpu_main}= | Cpu list per node str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${skip_cnt} | cpu_cnt=${CPU_CNT_MAIN} | | | ${skip_cnt}= | Evaluate | ${CPU_CNT_SYSTEM} + ${CPU_CNT_MAIN} -| | | ${cpu_wt}= | Cpu list per node str | ${nodes['${dut}']} | ${numa} +| | | ${cpu_wt}= | Run keyword if | ${cpu_count_int} > 0 | +| | | ... | Cpu list per node str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${skip_cnt} | cpu_cnt=${cpu_count_int} | | | ... | smt_used=${smt_used} | | | ${thr_count_int}= | Run keyword if | ${smt_used} @@ -172,9 +173,12 @@ | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} -| | | Run keyword | ${dut}.Add CPU Main Core | ${cpu_main} -| | | Run keyword | ${dut}.Add CPU Corelist Workers | ${cpu_wt} -| | | Run keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} +| | | Run keyword if | ${cpu_count_int} > 0 +| | | ... | ${dut}.Add CPU Main Core | ${cpu_main} +| | | Run keyword if | ${cpu_count_int} > 0 +| | | ... | ${dut}.Add CPU Corelist Workers | ${cpu_wt} +| | | Run keyword +| | | ... | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} # For now there is no way to easily predict the number of buffers. Statically # doing maximum amount of buffers allowed by DPDK. | | | Run keyword if | ${smt_used} @@ -431,11 +435,21 @@ | | [Documentation] | Write VPP startup configuration and restart VPP on all | | ... | DUTs. | | ... +| | ... | *Arguments:* +| | ... | - with_trace - Enable packet trace after VPP restart Type: boolean +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Apply startup configuration on all VPP DUTs \| False \| +| | ... +| | [Arguments] | ${with_trace}=${False} +| | ... | | :FOR | ${dut} | IN | @{duts} | | | Run keyword | ${dut}.Apply Config | | Save VPP PIDs | | Enable Coredump Limit VPP on All DUTs | ${nodes} | | Update All Interface Data On All Nodes | ${nodes} | skip_tg=${True} +| | Run keyword If | ${with_trace} | VPP Enable Traces On All Duts | ${nodes} | Save VPP PIDs | | [Documentation] | Get PIDs of VPP processes from all DUTs in topology and\ -- cgit 1.2.3-korg