X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fdpdk%2Fdefault.robot;h=021f73d8c3cd95c98bead54205614adcb2d35690;hp=cd5318c77a522047c096f50e10ebf7df943fdbbd;hb=14a71b74b414df7616ccb5ada3d50ecb90d96bae;hpb=8e601d0f37f715ca4ce55dded8bc27cadfe175c2 diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index cd5318c77a..021f73d8c3 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -37,10 +37,9 @@ | | ${cpu_count_int} | Convert to Integer | ${phy_cores} | | ${thr_count_int} | Convert to Integer | ${phy_cores} | | ${dp_cores}= | Evaluate | ${cpu_count_int}+1 -| | ${duts}= | Get Matches | ${nodes} | DUT* | | FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} -| | | ... | ${${dut}_if1} | ${${dut}_if2} +| | | ... | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} | | | ${cpus}= | Cpu Range Per Node Str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${1} | cpu_cnt=${dp_cores} | smt_used=${smt_used} @@ -79,10 +78,9 @@ | | ${cpu_count_int} | Convert to Integer | ${phy_cores} | | ${thr_count_int} | Convert to Integer | ${phy_cores} | | ${dp_cores}= | Evaluate | ${cpu_count_int}+1 -| | ${duts}= | Get Matches | ${nodes} | DUT* | | FOR | ${dut} | IN | @{duts} | | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} -| | | ... | ${${dut}_if1} | ${${dut}_if2} +| | | ... | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] | | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} | | | ${cpus}= | Cpu List Per Node Str | ${nodes['${dut}']} | ${numa} | | | ... | skip_cnt=${1} | cpu_cnt=${cpu_count_int} | smt_used=${smt_used} @@ -95,9 +93,10 @@ | | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 | | | ... | Set variable | ${1} | | | ... | ELSE | Set variable | ${rxq_count_int} -| | | Start the l3fwd test | ${nodes} | ${nodes['${dut}']} | ${${dut}_if1} -| | | ... | ${${dut}_if2} | ${thr_count_int} | ${cpus} | ${rxq_count_int} -| | | ... | ${jumbo_frames} +| | | Start the l3fwd test +| | | ... | ${nodes} | ${nodes['${dut}']} +| | | ... | ${${dut}_pf1}[0] | ${${dut}_pf2}[0] +| | | ... | ${thr_count_int} | ${cpus} | ${rxq_count_int} | ${jumbo_frames} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C