diff options
author | Peter Mikus <pmikus@cisco.com> | 2020-02-21 22:09:02 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2020-04-06 08:27:39 +0000 |
commit | 14a71b74b414df7616ccb5ada3d50ecb90d96bae (patch) | |
tree | bfee617c9a4b20ce4c6467ffbbe6c0a15199ba52 /resources/libraries/robot/dpdk/default.robot | |
parent | 8e601d0f37f715ca4ce55dded8bc27cadfe175c2 (diff) |
Improve pf layer
+ Merge single/double link
+ Introduce _pf{n}[0] variables so we can access physical function
same way as virtual function
+ Cleanup code by moving complex logic to python
+ Prepare code for multiple vf functions
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ic2e74a38bfa146441357de8f0916aeb638941c49
Diffstat (limited to 'resources/libraries/robot/dpdk/default.robot')
-rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 13 |
1 files changed, 6 insertions, 7 deletions
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 |