X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=196dc104962c7aacb9a6cc2d8482bbdf814202ee;hb=7cc1d28080ff1113ddb1f1e1fd494b2651a3199b;hp=5873701342399982b040f8a6b98811a96d5d42ba;hpb=b573e5b2823746ca7940938df8cdaafca3812a1f;p=csit.git diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 5873701342..196dc10496 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -129,9 +129,9 @@ | | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | | | ... | ${${dut}_if2_vf0} | | | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | | ... | ${if1_pci} +| | | ... | ${if1_pci} | ${rxq_count_int} | | | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | | ... | ${if2_pci} +| | | ... | ${if2_pci} | ${rxq_count_int} | | | Set Test Variable | ${${dut}_if1} | ${dut_eth_vf_if1} | | | Set Test Variable | ${${dut}_if2} | ${dut_eth_vf_if2} | | Set interfaces in path up @@ -2307,6 +2307,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: int | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: bool +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | KW uses test variables \${rxq_count_int}, \${thr_count_int} and @@ -2320,9 +2322,12 @@ | | ... | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${nf_cpus} | | ... | ${qemu_id}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... | | ${nf_cpus_count}= | Get Length | ${nf_cpus} +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} | | ... | WITH NAME | ${vm_name} | | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} @@ -2356,8 +2361,7 @@ | | Dpdk Testpmd Start | ${vm} | eal_corelist=${testpmd_cpus} | | ... | eal_mem_channels=4 | pmd_fwd_mode=io | pmd_disable_hw_vlan=${TRUE} | | ... | pmd_rxd=${perf_qemu_qsz} | pmd_txd=${perf_qemu_qsz} -| | ... | pmd_rxq=${rxq_count_int} | pmd_txq=${rxq_count_int} -| | ... | pmd_max_pkt_len=${max_pkt_len} +| | ... | pmd_rxq=${rxq} | pmd_txq=${rxq} | pmd_max_pkt_len=${max_pkt_len} | | Return From Keyword | ${vm} | Configure guest VMs with dpdk-testpmd connected via vhost-user on node @@ -2420,10 +2424,12 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} +| | | Copy nested qemu image | ${dut} | | | Configure guest VMs with dpdk-testpmd connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | [Documentation] @@ -2447,6 +2453,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: int | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: bool +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | KW uses test variables \${rxq_count_int}, \${thr_count_int} and @@ -2461,9 +2469,12 @@ | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | | ... | ${eth0_mac} | ${eth1_mac} | ${nf_cpus} | ${qemu_id}=${1} | | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... | | ${nf_cpus_count}= | Get Length | ${nf_cpus} +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} | | ... | WITH NAME | ${vm_name} | | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} @@ -2498,8 +2509,7 @@ | | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac} | | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${TRUE} | | ... | pmd_rxd=${perf_qemu_qsz} | pmd_txd=${perf_qemu_qsz} -| | ... | pmd_rxq=${rxq_count_int} | pmd_txq=${rxq_count_int} -| | ... | pmd_max_pkt_len=${max_pkt_len} +| | ... | pmd_rxq=${rxq} | pmd_txq=${rxq} | pmd_max_pkt_len=${max_pkt_len} | | Return From Keyword | ${vm} | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node @@ -2567,10 +2577,12 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} +| | | Copy nested qemu image | ${dut} | | | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user on node | | [Documentation] @@ -2588,6 +2600,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... @@ -2596,7 +2610,7 @@ | | ... | | [Arguments] | ${dut} | ${nf_chains}=${1} | ${nf_chain}=${1} | | ... | ${nf_nodes}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} | | ... | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} @@ -2625,6 +2639,7 @@ | | | ... | ${dut} | ${sock1} | ${sock2} | ${nf_name} | ${vif1_mac} | | | ... | ${vif2_mac} | ${nf_cpus} | qemu_id=${qemu_id} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} +| | | ... | auto_scale=${auto_scale} | | | Set To Dictionary | ${${dut}_vm_refs} | ${nf_name} | ${vm} | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user @@ -2642,6 +2657,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... @@ -2650,7 +2667,7 @@ | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_chain}=${1} | ${nf_nodes}=${1} | | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} @@ -2658,6 +2675,7 @@ | | | ... | ${dut} | nf_chains=${nf_chains} | nf_chain=${nf_chain} | | | ... | nf_nodes=${nf_nodes} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} +| | | ... | auto_scale=${auto_scale} | Configure chains of NFs with dpdk-testpmd-mac connected via vhost-user | | [Documentation] @@ -2673,6 +2691,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... @@ -2681,13 +2701,15 @@ | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${jumbo}=${False} | | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${auto_scale}=${False} | | ... | | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user | | | ... | nf_chains=${nf_chains} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} | | | ... | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} -| | | ... | use_tuned_cfs=${False} +| | | ... | use_tuned_cfs=${False} | auto_scale=${auto_scale} | | All VPP Interfaces Ready Wait | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Initialize LISP IPv4 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \ @@ -3020,6 +3042,7 @@ | | | Initialize L2 xconnect with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain with memif pairs on DUT node | | [Documentation] @@ -3031,6 +3054,8 @@ | | ... | - dut - DUT node. Type: dictionary | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: @@ -3042,7 +3067,11 @@ | | ... | \| ${dut} \| 1 \| 1 \| | | ... | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} +| | ... | ${auto_scale}=${True} | | ... +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} | | ${bd_id2}= | Evaluate | ${nf_nodes}+1 | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1} | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if2} @@ -3053,7 +3082,7 @@ | | | ${sock2}= | Set Variable | memif-${dut}_CNF | | | Set up memif interfaces on DUT node | ${nodes['${dut}']} | | | ... | ${sock1} | ${sock2} | ${nf_id} | ${dut}-memif-${nf_id}-if1 -| | | ... | ${dut}-memif-${nf_id}-if2 | ${rxq_count_int} | ${rxq_count_int} +| | | ... | ${dut}-memif-${nf_id}-if2 | ${rxq} | ${rxq} | | | ${bd_id2}= | Evaluate | ${nf_node}+1 | | | Add interface to bridge domain | ${nodes['${dut}']} | | | ... | ${${dut}-memif-${nf_id}-if1} | ${nf_node} @@ -3069,17 +3098,20 @@ | | ... | *Arguments:* | | ... | - nf_chain - NF chain. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain with memif pairs \| 1 \| 1 \| | | ... -| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} +| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut} | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | ... | auto_scale=${auto_scale} | Initialize L2 Bridge Domain for multiple chains with memif pairs | | [Documentation] @@ -3091,19 +3123,22 @@ | | ... | *Arguments:* | | ... | - nf_chains - Number of chains of NFs. Type: integer | | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain for multiple chains with memif pairs \ | | ... | \| 1 \| 1 \| | | ... -| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... | | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Initialize L2 Bridge Domain with memif pairs | nf_chain=${nf_chain} -| | | ... | nf_nodes=${nf_nodes} +| | | ... | nf_nodes=${nf_nodes} | auto_scale=${auto_scale} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain for pipeline with memif pairs | | [Documentation] @@ -3114,14 +3149,19 @@ | | ... | *Arguments:* | | ... | - nf_chain - NF pipe. Type: integer | | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain for pipeline with memif pairs \ | | ... | \| 1 \| 1 \| | | ... -| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} +| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1} @@ -3133,11 +3173,11 @@ | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | | | ... | memif-${dut}_CNF | mid=${nf_id_frst} | sid=${sid_frst} | | | ... | memif_if=${dut}-memif-${nf_id_frst}-if1 -| | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int} +| | | ... | rxq=${rxq} | txq=${rxq} | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | | | ... | memif-${dut}_CNF | mid=${nf_id_last} | sid=${sid_last} | | | ... | memif_if=${dut}-memif-${nf_id_last}-if2 -| | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int} +| | | ... | rxq=${rxq} | txq=${rxq} | | | Add interface to bridge domain | ${nodes['${dut}']} | | | ... | ${${dut}-memif-${nf_id_frst}-if1} | ${1} | | | Add interface to bridge domain | ${nodes['${dut}']} @@ -3153,19 +3193,23 @@ | | ... | *Arguments:* | | ... | - nf_chains - Number of pipelines of NFs. Type: integer | | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain for multiple pipelines with memif \ | | ... | pairs \| 1 \| 1 \| | | ... -| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... | | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Initialize L2 Bridge Domain for pipeline with memif pairs | | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | ... | auto_scale=${auto_scale} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology | | [Documentation] @@ -3242,6 +3286,7 @@ | | ... | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | ... | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize IPv4 routing with memif pairs on DUT node | | [Documentation] @@ -3386,6 +3431,7 @@ | | | Initialize IPv4 routing with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 xconnect for single memif | | [Documentation] @@ -3419,6 +3465,7 @@ | | | ... | ${${dut}-memif-${number}-if1} | | Set single interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain for single memif | | [Documentation]