diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2021-06-09 13:27:41 +0200 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2021-06-10 06:12:12 +0000 |
| commit | 9780b57a9640e9ab40e40ec122ac80e09cd74c79 (patch) | |
| tree | 1a9b1cdcd968459ec4e50c60caa8777b180f2600 /resources/libraries/robot | |
| parent | 924ab26cf80edfc9efb8116a2295478cd3f821ea (diff) | |
Dpdk in VM: Increase num_mbufs
Since switching to rxq ratio 1:1,
the previous value was not enough for 4c vhost tests.
+ Set the 1:1 rxq ratio also for DPDK (outside vhost) tests.
- Still not sure why those tests were not failing.
+ Set the 1:1 rxq ratio also for VPP container tests.
Ticket: CSIT-1783
Change-Id: Id9d136a638eb212a8105a6288e7847f3c35fefb0
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 9 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 957a2541d8..53e3f9f04e 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -46,9 +46,10 @@ | | | ${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} +| | | ${rxq_ratio} = | Get Variable Value | \${rxq_ratio} | ${1} +| | | ${rxq_count_int}= | Run Keyword If | ${rx_queues} | | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | | ... | ELSE | Evaluate | int(${thr_count_int}/${rxq_ratio}) | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} @@ -90,7 +91,7 @@ | | | ... | ${thr_count_int} | | | ${rxq_count_int}= | Run keyword if | ${rx_queues} | | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | | ... | ELSE | Evaluate | int(${thr_count_int}/1) | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index 06ac1209e5..1d4c9a17b0 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 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: @@ -330,9 +330,10 @@ | | ${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} +| | ${rxq_ratio} = | Get Variable Value | \${rxq_ratio} | ${1} +| | ${rxq_count_int}= | Run Keyword If | ${rx_queues} | | ... | Set variable | ${rx_queues} -| | ... | ELSE | Evaluate | int(${thr_count_int}/2) +| | ... | ELSE | Evaluate | int(${thr_count_int}/${rxq_ratio}) | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | ... | Set variable | ${1} | | ... | ELSE | Set variable | ${rxq_count_int} |