diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2020-02-28 07:13:27 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2020-03-10 11:10:27 +0000 |
| commit | 6daa2d791f0e0d41b73668ef3ee233e58987dc37 (patch) | |
| tree | e04db74c43eeb297284ab9431af97438fd2f7b7d /resources/libraries/robot | |
| parent | dddfcfb9ce358799ce2b9f53ffb8e1e594fb2cec (diff) | |
Make RXQs/TXQs configurable
Change-Id: Ib30bc4697fcba93a6723ee492a59a0523425f623
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 3 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/interfaces.robot | 22 |
2 files changed, 15 insertions, 10 deletions
diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 00c0691864..cd5318c77a 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -55,6 +55,7 @@ | | | ... | ELSE | Set variable | ${rxq_count_int} | | | Start the l2fwd test | ${nodes['${dut}']} | ${cpus} | ${thr_count_int} | | | ... | ${rxq_count_int} | ${jumbo_frames} +| | | ... | ${nic_rxq_size} | ${nic_txq_size} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index 163948801a..08a24cb150 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -191,10 +191,10 @@ | | | Run Keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} | | | Run Keyword If | not ${jumbo} | | | ... | ${dut}.Add DPDK No Multi Seg -| | | Run Keyword If | ${rxd_count_int} -| | | ... | ${dut}.Add DPDK Dev Default RXD | ${rxd_count_int} -| | | Run Keyword If | ${txd_count_int} -| | | ... | ${dut}.Add DPDK Dev Default TXD | ${txd_count_int} +| | | Run Keyword If | ${nic_rxq_size} > 0 +| | | ... | ${dut}.Add DPDK Dev Default RXD | ${nic_rxq_size} +| | | Run Keyword If | ${nic_txq_size} > 0 +| | | ... | ${dut}.Add DPDK Dev Default TXD | ${nic_txq_size} | | | Run Keyword If | '${crypto_type}' != '${None}' | | | ... | ${dut}.Add DPDK Cryptodev | ${thr_count_int} | | END @@ -266,11 +266,13 @@ | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} | | ${dut_new_if1}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if1_vf0} | ${rxq_count_int} +| | ... | ${${dut}_if1_vf0} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if2_vf0} | ${rxq_count_int} +| | ... | ${${dut}_if2_vf0} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} @@ -297,11 +299,13 @@ | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} | | ${dut_new_if1}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if1} | ${rxq_count_int} +| | ... | ${${dut}_if1} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${rdma_txq_size} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if2} | ${rxq_count_int} +| | ... | ${${dut}_if2} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${rdma_txq_size} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} |