X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_vars.robot;h=0721634f715e38f053ad429df51dedb0bb77f797;hp=f75d585e4b1cc1a330407e00eeb75c37b5123990;hb=f3a55b00e3f9e3418426c295cc6f9810a6eb137e;hpb=c0da585c7ea862cf37d0e559200c8b45dc4eabdc 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}