X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fsuite_setup.robot;h=232158a6e003bb49d2344d30f2c2d8a8447b7cf6;hb=585b2e3c08cb87badfe702eb29300634c761a17b;hp=09cec67e4e2669dbdd84e6e1f0f880e54d62fdf3;hpb=9377c956a86e42727039d9dab8879c10c9399f4c;p=csit.git

diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot
index 09cec67e4e..232158a6e0 100644
--- a/resources/libraries/robot/shared/suite_setup.robot
+++ b/resources/libraries/robot/shared/suite_setup.robot
@@ -24,6 +24,7 @@
 | Variables | resources/libraries/python/Constants.py
 |
 | Documentation | Suite setup keywords.
+
 *** Keywords ***
 | Create suite topology variables
 | | [Documentation]
@@ -83,12 +84,14 @@
 | |
 | | [Arguments] | @{actions}
 | |
+| | Start Suite Setup Export
 | | ${nic_model_list}= | Create list | ${nic_name}
 | | &{info}= | Compute Circular Topology
 | | ... | ${nodes} | filter_list=${nic_model_list} | nic_pfs=${nic_pfs}
 | | ... | always_same_link=${False} | topo_has_tg=${True}
 | | Set suite variable | &{topology_info} | &{info}
 | | Create suite topology variables | @{actions}
+| | Finalize Suite Setup Export
 
 | Setup suite topology interfaces with no TG
 | | [Documentation]
@@ -104,12 +107,37 @@
 | |
 | | [Arguments] | @{actions}
 | |
+| | Start Suite Setup Export
 | | ${nic_model_list}= | Create list | ${nic_name}
 | | &{info}= | Compute Circular Topology
 | | ... | ${nodes} | filter_list=${nic_model_list} | nic_pfs=${nic_pfs}
 | | ... | always_same_link=${True} | topo_has_tg=${False}
 | | Set suite variable | &{topology_info} | &{info}
 | | Create suite topology variables | @{actions}
+| | Finalize Suite Setup Export
+
+| Setup suite topology interfaces with no DUT
+| | [Documentation]
+| | ... | Common suite setup for single link tests with no device under test
+| | ... | node.
+| | ... |
+| | ... | Compute path for testing on given topology nodes in circular topology
+| | ... | based on interface model provided as an argument and set
+| | ... | corresponding suite variables.
+| |
+| | ... | *Arguments:*
+| | ... | - ${actions} - Additional setup action. Type: list
+| |
+| | [Arguments] | @{actions}
+| |
+| | Start Suite Setup Export
+| | ${nic_model_list}= | Create list | ${nic_name}
+| | &{info}= | Compute Circular Topology
+| | ... | ${nodes} | filter_list=${nic_model_list} | nic_pfs=${nic_pfs}
+| | ... | always_same_link=${True} | topo_has_tg=${True} | topo_has_dut=${False}
+| | Set suite variable | &{topology_info} | &{info}
+| | Create suite topology variables | @{actions}
+| | Finalize Suite Setup Export
 
 | Additional Suite Setup Action For scapy
 | | [Documentation]
@@ -130,6 +158,7 @@
 | | | Initialize DPDK Framework | ${nodes['${dut}']}
 | | | ... | ${${dut}_${int}1}[0] | ${${dut}_${int}2}[0] | ${nic_driver}
 | | END
+| | Get And Export DPDK Version
 
 | Additional Suite Setup Action For performance vf
 | | [Documentation]
@@ -141,15 +170,15 @@
 | |
 | | ... | *Example:*
 | |
-| | ... | \| Additional Suite Setup Action For performance_dut \| DUT1 \|
+| | ... | \| Additional Suite Setup Action For performance vf \| DUT1 \|
 | |
 | | [Arguments] | ${dut}
 | |
 | | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
 | | | ${_vf}=
-| | | ... | Run Keyword | Init ${nic_driver} interface
-| | | ... | ${nodes['${dut}']} | ${${dut}_pf${pf}}[0] | numvfs=${nic_vfs}
-| | | ... | osi_layer=${osi_layer}
+| | | ... | Run Keyword | Init interface
+| | | ... | ${nodes['${dut}']} | ${${dut}_pf${pf}}[0] | driver=${nic_driver}
+| | | ... | numvfs=${nic_vfs} | osi_layer=${osi_layer}
 | | | ${_mac}=
 | | | ... | Create List | ${EMPTY}
 | | | ${_ip4_addr}=
@@ -176,6 +205,26 @@
 | | Set Suite Variable
 | | ... | ${int} | prevf
 
+| Additional Suite Setup Action For performance pf
+| | [Documentation]
+| | ... | Additional Setup for suites which uses performance measurement for
+| | ... | single DUT (inner loop).
+| |
+| | ... | *Arguments:*
+| | ... | - dut - DUT node. Type: string
+| |
+| | ... | *Example:*
+| |
+| | ... | \| Additional Suite Setup Action For performance pf \| DUT1 \|
+| |
+| | [Arguments] | ${dut}
+| |
+| | FOR | ${pf} | IN RANGE | 1 | ${nic_pfs} + 1
+| | | Run Keyword | Init interface
+| | | ... | ${nodes['${dut}']} | ${${dut}_pf${pf}}[0] | driver=${nic_driver}
+| | | ... | numvfs=${0} | osi_layer=${osi_layer}
+| | END
+
 | Additional Suite Setup Action For performance
 | | [Documentation]
 | | ... | Additional Setup for suites which uses performance measurement.
@@ -183,6 +232,8 @@
 | | FOR | ${dut} | IN | @{duts}
 | | | Run Keyword If | ${nic_vfs} > 0
 | | | ... | Additional Suite Setup Action For performance vf | ${dut}
+| | | ... | ELSE
+| | | ... | Additional Suite Setup Action For performance pf | ${dut}
 | | END
 | | Initialize traffic generator
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
@@ -190,6 +241,19 @@
 | | ... | ${dut${duts_count}} | ${DUT${duts_count}_${int}2}[0]
 | | ... | ${osi_layer}
 
+| Additional Suite Setup Action For performance_tg_nic
+| | [Documentation]
+| | ... | Additional Setup for suites which uses performance measurement
+| | ... | for L1 cross connect tests
+| |
+| | # TRex suites have only TG (and a loopback cable), no SUT nor DUT.
+| | Export Dut Type And Version | none | ${EMPTY}
+| | Initialize traffic generator
+| | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
+| | ... | ${tg} | ${TG_pf2}[0]
+| | ... | ${tg} | ${TG_pf1}[0]
+| | ... | ${osi_layer}
+
 | Additional Suite Setup Action For ipsechw
 | | [Documentation]
 | | ... | Additional Setup for suites which uses QAT HW.