diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 56 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 51 |
2 files changed, 69 insertions, 38 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index ba6396f8fe..045a5d36ef 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -687,6 +687,10 @@ | | ... | routing for IPv6 with defined behaviour function and configure IPv6 | | ... | routes on both DUT nodes. | | ... +| | ... | *Note:* +| | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads +| | ... | and rxqueues to all DUTs +| | ... | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} @@ -694,9 +698,11 @@ | | ${sock1}= | Set Variable | memif-DUT1_VNF | | ${sock2}= | Set Variable | memif-DUT2_VNF | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1} -| | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq} | ${rxq} +| | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | Set up memif interfaces on DUT node | ${dut2} | ${sock2} | ${sock2} -| | ... | ${1} | dut2-memif-1-if1 | dut2-memif-1-if2 | ${rxq} | ${rxq} +| | ... | ${1} | dut2-memif-1-if1 | dut2-memif-1-if2 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Show Memif | ${nodes['${dut}']} @@ -2554,7 +2560,7 @@ | | Configure deterministic mode for NAT44 | | ... | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30 -| Initialize L2 xconnect for '${nr}' memif pairs and '${rxq}' rxqueues in 3-node circular topology +| Initialize L2 xconnect for '${nr}' memif pairs in 3-node circular topology | | [Documentation] | | ... | Create pairs of Memif interfaces on all defined VPP nodes. Cross | | ... | connect each Memif interface with one physical interface or virtual @@ -2567,9 +2573,13 @@ | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... +| | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads +| | ... | and rxqueues to all DUTs +| | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 xconnect for 1 Memif in 3-node circular topology \| +| | ... | \| Initialize L2 xconnect for 1 memif pairs in 3-node circular \ +| | ... | topology \| | | ... | | Set Interface State | ${dut1} | ${dut1_if1} | up | | Set Interface State | ${dut1} | ${dut1_if2} | up @@ -2581,7 +2591,7 @@ | | | ${prev_index}= | Evaluate | ${number}-1 | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 -| | | ... | dut1-memif-${number}-if2 | ${rxq} | ${rxq} +| | | ... | dut1-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} | | | ${dut1_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut1_if1} | | | ... | ${dut1-memif-${prev_index}-if2} | | | Configure L2XC | ${dut1} | ${dut1_xconnect_if1} @@ -2590,7 +2600,7 @@ | | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 -| | | ... | dut2-memif-${number}-if2 | ${rxq} | ${rxq} +| | | ... | dut2-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} | | | ${dut2_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut2_if1} | | | ... | ${dut2-memif-${prev_index}-if2} | | | Configure L2XC | ${dut2} | ${dut2_xconnect_if1} @@ -2602,7 +2612,7 @@ | | All Vpp Interfaces Ready Wait | ${nodes} | | Show Memif on all DUTs | ${nodes} -| Initialize L2 Bridge Domain for '${nr}' memif pairs and '${rxq}' rxqueues in 3-node circular topology +| Initialize L2 Bridge Domain for '${nr}' memif pairs in 3-node circular topology | | [Documentation] | | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each | | ... | Memif interface to separate L2 bridge domain with one physical or @@ -2630,7 +2640,7 @@ | | | ${sock2}= | Set Variable | memif-DUT1_VNF | | | Set up memif interfaces on DUT node | ${dut1} | | | ... | ${sock1} | ${sock2} | ${number} | dut1-memif-${number}-if1 -| | | ... | dut1-memif-${number}-if2 | ${rxq} | ${rxq} +| | | ... | dut1-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} | | | ${bd_id2}= | Evaluate | ${number}+1 | | | Add interface to bridge domain | ${dut1} | | | ... | ${dut1-memif-${number}-if1} | ${number} @@ -2640,7 +2650,7 @@ | | | ${sock2}= | Set Variable | memif-DUT2_VNF | | | Set up memif interfaces on DUT node | ${dut2} | | | ... | ${sock1} | ${sock2} | ${number} | dut2-memif-${number}-if1 -| | | ... | dut2-memif-${number}-if2 | ${rxq} | ${rxq} +| | | ... | dut2-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} | | | Add interface to bridge domain | ${dut2} | | | ... | ${dut2-memif-${number}-if1} | ${number} | | | Add interface to bridge domain | ${dut2} @@ -2654,26 +2664,30 @@ | | ... | connect Memif interface with one physical interface. | | ... | | ... | *Arguments:* -| | ... | - ${rxq} - Number of Memif RX queues. Type: integer | | ... | - ${number} - Memif ID. Type: integer | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... +| | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads +| | ... | and rxqueues to all DUTs +| | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 xconnect for single memif in 3-node circular \ -| | ... | topology \| 1 \| 1 \| +| | ... | topology \| 1 \| | | ... -| | [Arguments] | ${rxq}=${1} | ${number}=${1} +| | [Arguments] | ${number}=${1} | | ${sock}= | Set Variable | memif-DUT1_VNF | | Set up single memif interface on DUT node | ${dut1} | ${sock} -| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq} | ${rxq} +| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1-memif-${number}-if1} | | ${sock}= | Set Variable | memif-DUT2_VNF | | Set up single memif interface on DUT node | ${dut2} | ${sock} -| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq} | ${rxq} +| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2-memif-${number}-if1} | | All Vpp Interfaces Ready Wait | ${nodes} | | Show Memif on all DUTs | ${nodes} @@ -2684,28 +2698,32 @@ | | ... | interface to separate L2 bridge domain with one physical interface. | | ... | | ... | *Arguments:* -| | ... | - ${rxq} - Number of Memif RX queues. Type: integer | | ... | - ${number} - Memif ID. Type: integer | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: | | ... | - /tmp/memif-DUT1_VNF${number}-${sid} | | ... +| | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads +| | ... | and rxqueues to all DUTs +| | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain for single memif in 3-node circular \ -| | ... | topology \| 1 \| 1 \| +| | ... | topology \| 1 \| | | ... -| | [Arguments] | ${rxq}=${1} | ${number}=${1} +| | [Arguments] | ${number}=${1} | | ${sock}= | Set Variable | memif-DUT1_VNF | | Set up single memif interface on DUT node | ${dut1} | ${sock} -| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq} | ${rxq} +| | ... | ${number} | dut1-memif-${number}-if1 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${number} | | Add interface to bridge domain | ${dut1} | ${dut1-memif-${number}-if1} | | ... | ${number} | | ${sock}= | Set Variable | memif-DUT2_VNF | | Set up single memif interface on DUT node | ${dut2} | ${sock} -| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq} | ${rxq} +| | ... | ${number} | dut2-memif-${number}-if1 | ${rxq_count_int} +| | ... | ${rxq_count_int} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${number} | | Add interface to bridge domain | ${dut2} | ${dut2-memif-${number}-if1} | | ... | ${number} diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index b3e10dc2d3..d0bd929386 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -141,17 +141,17 @@ | | ... | mTnC, where m=logical_core_count and n=physical_core_count. | | ... | | ... | *Arguments:* -| | ... | - cpu_cnt - Number of physical cores to use. Type: integer +| | ... | - phy_cores - Number of physical cores to use. Type: integer | | ... | - rx_queues - Number of RX queues. Type: integer | | ... | | ... | *Example:* | | ... | | ... | \| Add worker threads and rxqueues to all DUTs \| ${1} \| ${1} \| | | ... -| | [Arguments] | ${cpu_cnt} | ${rx_queues} +| | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | | ... -| | ${cpu_count_int} | Convert to Integer | ${cpu_cnt} -| | ${thr_count_int} | Convert to Integer | ${cpu_cnt} +| | ${cpu_count_int} | Convert to Integer | ${phy_cores} +| | ${thr_count_int} | Convert to Integer | ${phy_cores} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} @@ -161,23 +161,24 @@ | | | ... | skip_cnt=${1} | cpu_cnt=${1} | | | ${cpu_wt}= | Cpu list per node str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${2} | cpu_cnt=${cpu_count_int} | smt_used=${smt_used} +| | | ${thr_count_int}= | Run keyword if | ${smt_used} +| | | ... | Evaluate | int(${cpu_count_int}*2) +| | | ... | ELSE | Set variable | ${thr_count_int} +| | | ${rxq_count_int}= | Run keyword if | ${rx_queues} +| | | ... | Set variable | ${rx_queues} +| | | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | | ${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 | ${rx_queues} -| | | ${thr_count_int}= | Run keyword if | ${smt_used} | -| | | ... | Evaluate | int(${cpu_count_int}*2) | ELSE | Set variable -| | | ... | ${thr_count_int} +| | | Run keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C - -# FIXME: Remove the keyword after refactor of suites. Currently kept for -# backward compatibility only. -| Add '${m}' worker threads and '${n}' rxqueues in 3-node single-link circular topology -| | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\ -| | ... | configuration on all DUTs in 3-node single-link topology. -| | ... -| | Add worker threads and rxqueues to all DUTs | ${m} | ${n} +| | Set Test Variable | ${smt_used} +| | Set Test Variable | ${thr_count_int} +| | Set Test Variable | ${rxq_count_int} | Add no multi seg to all DUTs | | [Documentation] | Add No Multi Seg to VPP startup configuration to all DUTs. @@ -257,7 +258,11 @@ | | [Arguments] | ${count} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Run keyword | ${dut}.Add DPDK Cryptodev | ${count} +| | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} +| | | ${thr_count_int}= | Run keyword if | ${smt_used} +| | | ... | Evaluate | int(${count}*2) +| | | ... | ELSE | Set variable | ${count} +| | | Run keyword | ${dut}.Add DPDK Cryptodev | ${thr_count_int} | Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology | | [Documentation] | Add required number of SW crypto devices of given type @@ -274,12 +279,20 @@ | | ... | topology \| aesni-mb \| ${2} \| | | ... | | [Arguments] | ${sw_pmd_type} | ${count} +| | ${smt_used}= | Is SMT enabled | ${nodes['DUT1']['cpuinfo']} +| | ${thr_count_int}= | Run keyword if | ${smt_used} +| | ... | Evaluate | int(${count}*2) +| | ... | ELSE | Set variable | ${count} | | ${socket_id}= | Get Interface Numa Node | ${nodes['DUT1']} | ${dut1_if2} | | Run keyword | DUT1.Add DPDK SW Cryptodev | ${sw_pmd_type} | ${socket_id} -| | ... | ${count} +| | ... | ${thr_count_int} +| | ${smt_used}= | Is SMT enabled | ${nodes['DUT2']['cpuinfo']} +| | ${thr_count_int}= | Run keyword if | ${smt_used} +| | ... | Evaluate | int(${count}*2) +| | ... | ELSE | Set variable | ${count} | | ${socket_id}= | Get Interface Numa Node | ${nodes['DUT2']} | ${dut2_if1} | | Run keyword | DUT2.Add DPDK SW Cryptodev | ${sw_pmd_type} | ${socket_id} -| | ... | ${count} +| | ... | ${thr_count_int} | Apply startup configuration on all VPP DUTs | | [Documentation] | Write startup configuration and restart VPP on all DUTs. |