diff options
4 files changed, 18 insertions, 35 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index c68620b8ce..438a8c0288 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -1384,6 +1384,9 @@ function set_environment_variables () { *"-x-2n"* | *"-x-3n"* ) export TREX_CORE_COUNT=14 export TREX_PORT_MTU=9000 + # Be gentle on infra. + export INFRA_WARMUP_DURATION=5 + export INFRA_WARMUP_RATE=253 # Settings to prevent duration stretching. export PERF_TRIAL_STL_DELAY=0.12 ;; diff --git a/resources/libraries/python/HoststackUtil.py b/resources/libraries/python/HoststackUtil.py index 3ada07b2a4..cb3970ff0c 100644 --- a/resources/libraries/python/HoststackUtil.py +++ b/resources/libraries/python/HoststackUtil.py @@ -285,7 +285,7 @@ class HoststackUtil(): # NGINX used `worker_cpu_affinity` in configuration file taskset_cmd = u"" if program_name == u"nginx" else \ f"taskset --cpu-list {core_list}" - cmd = f"nohup {shell_cmd} \'{env_vars}{taskset_cmd} " \ + cmd = f"nohup {taskset_cmd} {shell_cmd} \'{env_vars} " \ f"{program_path}{program_name} {args} >/tmp/{program_name}_" \ f"stdout.log 2>/tmp/{program_name}_stderr.log &\'" try: @@ -322,6 +322,15 @@ class HoststackUtil(): exec_cmd_no_error(node, cmd, message=errmsg, sudo=True) @staticmethod + def sleep_for_hoststack_test_duration(sleep_time): + """Wait for the HostStack test program process to complete. + + :param sleep_time: waiting stecific time. + """ + logger.info(f"Sleeping for {sleep_time} seconds") + sleep(sleep_time + 1) + + @staticmethod def hoststack_test_program_finished(node, program_pid, program, other_node, other_program): """Wait for the specified HostStack test program process to complete. diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot index 643a67cd85..6d1f49a4fb 100644 --- a/resources/libraries/robot/hoststack/hoststack.robot +++ b/resources/libraries/robot/hoststack/hoststack.robot @@ -44,6 +44,7 @@ | ... | sess_v4_hopen_mem=64M | ... | sess_lendpt_buckets=250000 | ... | sess_lendpt_mem=512M +| ... | strace=${False} | &{vpp_echo_server_attr}= | ... | role=server | ... | cpu_cnt=${1} @@ -565,8 +566,11 @@ | | ... | ${dut1} | ${dut1_if1} | ${dut1_if1_ip4_addr} | ${dut1_if1_ip4_prefix} | | ... | ${iperf3_client_attr}[namespace] | ${core_list} | | ... | ${iperf3_client_attr}[cfg_vpp_feature] | ${iperf3_client} -| | When Hoststack Test Program Finished | ${dut1} | ${client_pid} +| | Run Keyword If | ${vpp_hoststack_attr}[strace] +| | ... | When Hoststack Test Program Finished | ${dut1} | ${client_pid} | | ... | ${iperf3_client} | ${dut2} | ${iperf3_server} +| | ... | ELSE +| | ... | Sleep For Hoststack Test Duration | ${iperf3_client_attr}[time] | | FOR | ${action} | IN | @{stat_post_trial} | | | Run Keyword | Additional Statistics Action For ${action} | | END diff --git a/resources/libraries/robot/performance/performance_actions.robot b/resources/libraries/robot/performance/performance_actions.robot index 9ef3f56d0d..36f126b9ec 100644 --- a/resources/libraries/robot/performance/performance_actions.robot +++ b/resources/libraries/robot/performance/performance_actions.robot @@ -63,39 +63,6 @@ | | ... | rate=${telemetry_rate} | export=${False} | | Stop traffic on tg -| # TODO: Delete this keyword (unused in fd.io) when downstream stops using it. -| Additional Statistics Action For infra-warmup -| | [Documentation] -| | ... | Additional Statistics Action for infra warmup. -| | -| | ... | See documentation of the called keyword for required test variables. -| | -| | ${ppta} = | Get Packets Per Transaction Aggregated -| | ${ramp_up_duration} = | Get Ramp Up Duration -| | ${ramp_up_rate} = | Get Ramp Up Rate -| | ${runtime_duration} = | Get Runtime Duration -| | ${runtime_rate} = | Get Runtime Rate -| | ${traffic_directions} = | Get Traffic Directions -| | ${transaction_duration} = | Get Transaction Duration -| | ${transaction_scale} = | Get Transaction Scale -| | ${transaction_type} = | Get Transaction Type -| | ${use_latency} = | Get Use Latency -| | Send traffic on tg -| | ... | duration=${5} -| | ... | rate=${253} -| | ... | frame_size=${frame_size} -| | ... | traffic_profile=${traffic_profile} -| | ... | async_call=${False} -| | ... | ppta=${ppta} -| | ... | use_latency=${False} -| | ... | traffic_directions=${traffic_directions} -| | ... | transaction_duration=${transaction_duration} -| | ... | transaction_scale=${transaction_scale} -| | ... | transaction_type=${transaction_type} -| | ... | duration_limit=${0.0} -| | ... | ramp_up_duration=${ramp_up_duration} -| | ... | ramp_up_rate=${ramp_up_rate} - | Additional Statistics Action For noop | | [Documentation] | | ... | Additional Statistics Action for no operation. |