diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2022-06-10 16:01:22 +0200 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2022-06-21 16:24:27 +0000 |
| commit | 7380ad9ce763501a32417fc375256aa967297dd3 (patch) | |
| tree | b1ca3c81af905c46504378a8738a68f0cdbc7638 /resources | |
| parent | ec4fc68441415927c66ffed89185617416831ad1 (diff) | |
fix(hoststack): distinguish two tcp tag types
Previous change did not consider TCP_PPS and TCP_CPS robot tags
are used by two different suite types (hoststack or ASTF).
This fixes the unintended impact on hoststack.
+ Add HOSTSTACK tag to VSAP suites.
- They could also get VSAP tag, but not needed for this Change.
Fixes: 1daa6fdc0bae284dee1b61f34534e59b60b7526a
Change-Id: Ic583b5ae336c9b74794706fefc232f221a243c87
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit f3a55b00e3f9e3418426c295cc6f9810a6eb137e)
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/robot/performance/performance_vars.robot | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/resources/libraries/robot/performance/performance_vars.robot b/resources/libraries/robot/performance/performance_vars.robot index f75d585e4b..0721634f71 100644 --- a/resources/libraries/robot/performance/performance_vars.robot +++ b/resources/libraries/robot/performance/performance_vars.robot @@ -532,11 +532,15 @@ | | ... | '${frame_size}' == 'IMIX_v4_1' | Set Variable | ${353.8333333333333} | | ... | ELSE | Convert To Number | ${frame_size} | | # Long boolean formula in 2 lines. -| | ${is_tcp_pps} = | Evaluate | 'TCP_PPS' in ${TEST_TAGS} -| | ${is_tcp_tput} = | Evaluate | ${is_tcp_pps} or 'TCP_TPUT' in ${TEST_TAGS} +| | ${is_cps} = | Evaluate | 'TCP_CPS' in ${TEST_TAGS} +| | ${is_pps} = | Evaluate | 'TCP_PPS' in ${TEST_TAGS} +| | ${is_tput} = | Evaluate | ${is_pps} or 'TCP_TPUT' in ${TEST_TAGS} +| | # TODO: Investigate impact of values on hoststack tests. +| | ${is_cps} = | Evaluate | ${is_cps} and 'HOSTSTACK' not in ${TEST_TAGS} +| | ${is_tput} = | Evaluate | ${is_tput} and 'HOSTSTACK' not in ${TEST_TAGS} | | ${avg_dir_frame_size} | ${avg_agg_frame_size} = | Run Keyword If -| | ... | 'TCP_CPS' in ${TEST_TAGS} | Apply Tcp Cps Proto Overhead | ${bafs} -| | ... | ELSE IF | ${is_tcp_tput} | Apply Tcp Tput Proto Overhead | ${bafs} +| | ... | ${is_cps} | Apply Tcp Cps Proto Overhead | ${bafs} +| | ... | ELSE IF | ${is_tput} | Apply Tcp Tput Proto Overhead | ${bafs} | | ... | ELSE | Set Variable | ${bafs} | ${bafs} | | ${max_overhead} = | Set Variable If | ${overhead} >= 0 | ${overhead} | ${0} | | ${mfs} = | Evaluate | ${bare_max_frame_size} + ${max_overhead} |