diff options
Diffstat (limited to 'resources/libraries/robot/default.robot')
| -rw-r--r-- | resources/libraries/robot/default.robot | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index 59c5e137a0..fb9a70dfe0 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -28,49 +28,49 @@ | | [Documentation] | Prepare all TGs before traffic scripts execution | | All TGs Set Interface Default Driver | ${nodes} -| Add '${m}' worker threads and rss '${n}' without HTT to all DUTs -| | [Documentation] | Setup M worker threads without HTT and rss N in startup -| | ... | configuration of VPP to all DUTs +| Add '${m}' worker threads and rxqueues '${n}' without HTT to all DUTs +| | [Documentation] | Setup M worker threads without HTT and rxqueues N in +| | ... | startup configuration of VPP to all DUTs | | ${cpu}= | Catenate | main-core | 0 | corelist-workers | | ${cpu}= | Run Keyword If | '${m}' == '1' | Catenate | ${cpu} | 1 | | ... | ELSE IF | '${m}' == '2' | Catenate | ${cpu} | 1-2 | | ... | ELSE IF | '${m}' == '4' | Catenate | ${cpu} | 1-4 | | ... | ELSE IF | '${m}' == '6' | Catenate | ${cpu} | 1-6 | | ... | ELSE | Fail | Not supported combination -| | ${rss}= | Catenate | rss | ${n} -| | Add worker threads and rss to all DUTs | ${cpu} | ${rss} +| | ${rxqueues}= | Catenate | num-rx-queues | ${n} +| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues} -| Add '${m}' worker threads and rss '${n}' with HTT to all DUTs -| | [Documentation] | Setup M worker threads with HTT and rss N in startup -| | ... | configuration of VPP to all DUTs +| Add '${m}' worker threads and rxqueues '${n}' with HTT to all DUTs +| | [Documentation] | Setup M worker threads with HTT and rxqueues N in +| | ... | startup configuration of VPP to all DUTs | | ${cpu}= | Catenate | main-core | 0 | corelist-workers | | ${cpu}= | Run Keyword If | '${m}' == '2' | Catenate | ${cpu} | 1,10 | | ... | ELSE IF | '${m}' == '4' | Catenate | ${cpu} | 1-2,10-11 | | ... | ELSE IF | '${m}' == '6' | Catenate | ${cpu} | 1-3,10-12 | | ... | ELSE IF | '${m}' == '8' | Catenate | ${cpu} | 1-4,10-13 | | ... | ELSE | Fail | Not supported combination -| | ${rss}= | Catenate | rss | ${n} -| | Add worker threads and rss to all DUTs | ${cpu} | ${rss} +| | ${rxqueues}= | Catenate | num-rx-queues | ${n} +| | Add worker threads and rxqueues to all DUTs | ${cpu} | ${rxqueues} -| Add worker threads and rss to all DUTs -| | [Documentation] | Setup worker threads and rss in VPP startup configuration -| | ... | to all DUTs +| Add worker threads and rxqueues to all DUTs +| | [Documentation] | Setup worker threads and rxqueues in VPP startup +| | ... | configuration to all DUTs | | ... | | ... | *Arguments:* | | ... | - ${cpu} - CPU configuration. Type: string -| | ... | - ${rss} - RSS configuration. Type: string +| | ... | - ${rxqueues} - rxqueues configuration. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Add worker threads and rss to all DUTs \| main-core 0 \ -| | ... | \| rss 2 -| | [Arguments] | ${cpu} | ${rss} +| | ... | \| Add worker threads and rxqueues to all DUTs \| main-core 0 \ +| | ... | \| rxqueues 2 +| | [Arguments] | ${cpu} | ${rxqueues} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Add CPU config | ${nodes['${dut}']} | | | ... | ${cpu} -| | | Add RSS config | ${nodes['${dut}']} -| | | ... | ${rss} +| | | Add rxqueues config | ${nodes['${dut}']} +| | | ... | ${rxqueues} | Add all PCI devices to all DUTs | | [Documentation] | Add all available PCI devices from topology file to VPP @@ -101,14 +101,6 @@ | | :FOR | ${dut} | IN | @{duts} | | | Add No Multi Seg Config | ${nodes['${dut}']} -| Add Max Tx Queues '${m}' to all DUTs -| | [Documentation] | Add Max Tx Queues M to VPP startup configuration to all -| | ... | DUTs -| | ${queues}= | Catenate | max-tx-queues | ${m} -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Add Max Tx Queues Config | ${nodes['${dut}']} | ${queues} - | Remove startup configuration of VPP from all DUTs | | [Documentation] | Remove VPP startup configuration from all DUTs | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -117,14 +109,13 @@ | | | Remove All CPU Config | ${nodes['${dut}']} | | | Remove Socketmem Config | ${nodes['${dut}']} | | | Remove Heapsize Config | ${nodes['${dut}']} -| | | Remove RSS Config | ${nodes['${dut}']} -| | | Remove Max Tx Queues Config | ${nodes['${dut}']} +| | | Remove Rxqueues Config | ${nodes['${dut}']} | | | Remove No Multi Seg Config | ${nodes['${dut}']} | Setup default startup configuration of VPP on all DUTs | | [Documentation] | Setup default startup configuration of VPP to all DUTs | | Remove startup configuration of VPP from all DUTs -| | Add '1' worker threads and rss '1' without HTT to all DUTs +| | Add '1' worker threads and rxqueues '1' without HTT to all DUTs | | Add all PCI devices to all DUTs | | Apply startup configuration on all VPP DUTs |