From a18e4ef1bedf1c8769c119e9bd3b8237ff89f6ef Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 4 Sep 2023 14:31:34 +0200 Subject: [PATCH] fix(hoststack): hardcode DUT1 for nginx Previously, the Set up LDP or VCL Nginx on DUT node keyword was wrongly documenting its "dut" argument as type string, while using the value as a node dict instead. As most of the code already used direct dut1 variables, this patch eliminates the dut argument altogether and puts DUT1 into the keyword name. Change-Id: Ie29afc175b98c1b1cb554438da9178738662d108 Signed-off-by: Vratko Polak --- .../libraries/robot/hoststack/hoststack.robot | 34 +++++++++++----------- ...eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot | 2 +- ...eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/libraries/robot/hoststack/hoststack.robot b/resources/libraries/robot/hoststack/hoststack.robot index 2661ea1eef..34e34b056c 100644 --- a/resources/libraries/robot/hoststack/hoststack.robot +++ b/resources/libraries/robot/hoststack/hoststack.robot @@ -557,13 +557,14 @@ | | Then Set test message | ${client_output} | | Return From Keyword | ${client_defer_fail} -| Set up LDP or VCL Nginx on DUT node +| Set up LDP or VCL Nginx on DUT1 node | | [Documentation] -| | ... | Setup for suites which uses VCL or LDP Nginx on DUT. +| | ... | Setup for suites which uses VCL or LDP Nginx on DUT1. +| | +| | ... | Currently hardcoded to work on DUT1, assuming its node dict +| | ... | and similar values like \${DUT1_cpu_alloc_str} are already defined. | | | | ... | *Arguments:* -| | ... | - dut - DUT node. -| | ... | Type: string | | ... | - mode - VCL Nginx or LDP Nginx. | | ... | Type: string | | ... | - rps_cps - Test request or connect. @@ -576,32 +577,31 @@ | | | | ... | *Example:* | | -| | ... | \| Set up LDP or VCL NGINX on DUT node \| ${dut} |${mode}\ +| | ... | \| Set up LDP or VCL NGINX on DUT1 node \| ${mode}\ | | ... | \| ${rps_cps} \| ${phy_cores} \| ${qat} \| ${tls_tcp} \| | | -| | [Arguments] | ${dut} | ${mode} | ${rps_cps} | ${phy_cores} | ${qat} -| | ... | ${tls_tcp} +| | [Arguments] | ${mode} | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} | | -| | Set Interface State | ${dut} | ${DUT1_${int}1}[0] | up -| | VPP Interface Set IP Address | ${dut} | ${DUT1_${int}1}[0] +| | Set Interface State | ${DUT1} | ${DUT1_${int}1}[0] | up +| | VPP Interface Set IP Address | ${DUT1} | ${DUT1_${int}1}[0] | | ... | ${dut_ip_addrs}[0] | ${dut_ip_prefix} -| | Vpp Node Interfaces Ready Wait | ${dut} +| | Vpp Node Interfaces Ready Wait | ${DUT1} | | ${skip_cnt}= | Evaluate | | ... | ${CPU_CNT_SYSTEM} + ${CPU_CNT_MAIN} + ${vpp_hoststack_attr}[phy_cores] -| | ${numa}= | Get interfaces numa node | ${dut} | ${DUT1_${int}1}[0] -| | Apply Nginx configuration on DUT | ${dut} | ${phy_cores} +| | ${numa}= | Get interfaces numa node | ${DUT1} | ${DUT1_${int}1}[0] +| | Apply Nginx configuration on DUT | ${DUT1} | ${phy_cores} | | Set To Dictionary | ${nginx_server_attr} | ip_address | | ... | ${dut_ip_addrs}[0] -| | ${core_list}= | Cpu list per node str | ${dut} | ${numa} +| | ${core_list}= | Cpu list per node str | ${DUT1} | ${numa} | | ... | skip_cnt=${skip_cnt} | cpu_cnt=${nginx_server_attr}[cpu_cnt] -| | ${cpu_idle_list}= | Get cpu idle list | ${dut} | ${numa} -| | ... | ${smt_used} | ${${dut}_cpu_alloc_str} +| | ${cpu_idle_list}= | Get cpu idle list | ${DUT1} | ${numa} +| | ... | ${smt_used} | ${DUT1_cpu_alloc_str} | | ${nginx_server}= | Get Nginx Command | ${nginx_server_attr} | | ... | ${nginx_version} | ${packages_dir} | | ${server_pid}= | Start Hoststack Test Program -| | ... | ${dut} | ${nginx_server_attr}[namespace] | ${core_list} +| | ... | ${DUT1} | ${nginx_server_attr}[namespace] | ${core_list} | | ... | ${nginx_server} -| | Taskset Nginx PID to idle cores | ${dut} | ${cpu_idle_list} +| | Taskset Nginx PID to idle cores | ${DUT1} | ${cpu_idle_list} | Measure TLS requests or connections per second | | [Documentation] diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot index 2fe9b04fea..d93fe70430 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-cps.robot @@ -88,7 +88,7 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second diff --git a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot index 1bf2363809..3282f6a711 100644 --- a/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot +++ b/tests/vpp/perf/hoststack/2n1l-10ge2p1x710-eth-ip4tcphttp-ldpreload-nginx-1_21_5-rps.robot @@ -88,7 +88,7 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize layer driver | ${nic_driver} | | And Initialize layer interface -| | And Set up LDP or VCL Nginx on DUT node | ${dut1} | ${mode} +| | And Set up LDP or VCL Nginx on DUT1 node | ${mode} | | ... | ${rps_cps} | ${phy_cores} | ${qat} | ${tls_tcp} | | And Additional Suite Setup Action For ab | | Then Measure TLS requests or connections per second -- 2.16.6