X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Fsuite_setup.robot;h=7518899ee144957b25c03937a82d4ad27344b78c;hp=30fb5ac20663077753d6e233f92f9a38a229dab0;hb=b55e324d526e5b05baef015c3614b9743c955992;hpb=1577123a3c27541181097cb4186aa8855f20b1cc

diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot
index 30fb5ac206..7518899ee1 100644
--- a/resources/libraries/robot/shared/suite_setup.robot
+++ b/resources/libraries/robot/shared/suite_setup.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -20,7 +20,9 @@
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.TrafficGenerator
 | Library | resources.tools.wrk.wrk
-| ...
+| Variables | resources/libraries/python/Constants.py
+| Resource | resources/libraries/robot/wrk/wrk_utils.robot
+|
 | Documentation | Suite setup keywords.
 
 *** Keywords ***
@@ -31,7 +33,7 @@
 | | ... | Compute path for testing on two given nodes in circular topology
 | | ... | based on interface model provided as an argument and set
 | | ... | corresponding suite variables.
-| | ...
+| |
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - duts - List of DUT nodes
 | | ... | - duts_count - Number of DUT nodes.
@@ -45,21 +47,22 @@
 | | ... | - dut{n}_if1_mac - 1st DUT interface MAC address.
 | | ... | - dut{n}_if2 - 2nd DUT interface.
 | | ... | - dut{n}_if2_mac - 2nd DUT interface MAC address.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${actions} - Additional setup action. Type: list
-| | ...
+| |
 | | [Arguments] | @{actions}
-| | ...
+| |
 | | ${nic_model_list}= | Create list | ${nic_name}
 | | Append Node | ${nodes['TG']}
 | | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
+| | FOR | ${dut} | IN | @{duts}
 | | | Append Node | ${nodes['${dut}']} | filter_list=${nic_model_list}
+| | END
 | | Append Node | ${nodes['TG']}
 | | Compute Path | always_same_link=${FALSE}
 | | ${tg_if1} | ${tg}= | Next Interface
-| | :FOR | ${dut} | IN | @{duts}
+| | FOR | ${dut} | IN | @{duts}
 | | | ${dutx_if1} | ${dutx}= | Next Interface
 | | | ${dutx_if2} | ${dutx}= | Next Interface
 | | | ${dutx_if1_mac}= | Get Interface MAC | ${dutx} | ${dutx_if1}
@@ -70,6 +73,7 @@
 | | | Set Suite Variable | ${${dut_str}_if2} | ${dutx_if2}
 | | | Set Suite Variable | ${${dut_str}_if1_mac} | ${dutx_if1_mac}
 | | | Set Suite Variable | ${${dut_str}_if2_mac} | ${dutx_if2_mac}
+| | END
 | | ${tg_if2} | ${tg}= | Next Interface
 | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -81,8 +85,67 @@
 | | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
 | | Set Suite Variable | ${tg_if2_mac}
-| | :FOR | ${action} | IN | @{actions}
+| | FOR | ${action} | IN | @{actions}
+| | | Run Keyword | Additional Suite setup Action For ${action}
+| | END
+
+| Setup suite single link no tg
+| | [Documentation]
+| | ... | Common suite setup for single link tests.
+| | ... |
+| | ... | Compute path for testing on two given nodes in circular topology
+| | ... | based on interface model provided as an argument and set
+| | ... | corresponding suite variables.
+| |
+| | ... | _NOTE:_ This KW sets following suite variables:
+| | ... | - duts - List of DUT nodes
+| | ... | - duts_count - Number of DUT nodes.
+| | ... | - dut{n} - DUTx node
+| | ... | - dut{n}_if1 - 1st DUT interface.
+| | ... | - dut{n}_if1_mac - 1st DUT interface MAC address.
+| | ... | - dut{n}_if2 - 2nd DUT interface.
+| | ... | - dut{n}_if2_mac - 2nd DUT interface MAC address.
+| |
+| | ... | *Arguments:*
+| | ... | - ${actions} - Additional setup action. Type: list
+| |
+| | [Arguments] | @{actions}
+| |
+| | ${nic_model_list}= | Create list | ${nic_name}
+| | ${duts}= | Get Matches | ${nodes} | DUT*
+| | FOR | ${dut} | IN | @{duts}
+| | | Append Node | ${nodes['${dut}']} | filter_list=${nic_model_list}
+| | END
+| | Append Node | ${nodes['@{duts}[0]']} | filter_list=${nic_model_list}
+| | Compute Path | always_same_link=${FALSE}
+| | FOR | ${i} | IN RANGE | 1 | ${DATAPATH_INTERFACES_MAX}
+| | | ${dutx_if} | ${dutx}= | Next Interface
+| | | Run Keyword If | '${dutx_if}' == 'None' | EXIT FOR LOOP
+| | | ${dutx_if_mac}= | Get Interface MAC | ${dutx} | ${dutx_if}
+| | | ${dutx_if_ip4_addr}= | Get Interface Ip4 | ${dutx} | ${dutx_if}
+| | | ${dutx_if_ip4_prefix_length}= | Get Interface Ip4 Prefix Length
+| | | ... | ${dutx} | ${dutx_if}
+| | | ${dut_str}= | Get Keyname For DUT | ${dutx} | ${duts}
+| | | ${if1_status} | ${value}= | Run Keyword And Ignore Error
+| | | ... | Variable Should Exist | ${${dut_str}_if1}
+| | | ${if_name}= | Set Variable If | '${if1_status}' == 'PASS'
+| | | ... | if2 | if1
+| | | Set Suite Variable | ${${dut_str}} | ${dutx}
+| | | Set Suite Variable | ${${dut_str}_${if_name}} | ${dutx_if}
+| | | Set Suite Variable | ${${dut_str}_${if_name}_mac} | ${dutx_if_mac}
+| | | Set Suite Variable | ${${dut_str}_${if_name}_ip4_addr}
+| | | ... | ${dutx_if_ip4_addr}
+| | | Set Suite Variable | ${${dut_str}_${if_name}_ip4_prefix}
+| | | ... | ${dutx_if_ip4_prefix_length}
+| | END
+| | Run Keyword If | ${i}>${DATAPATH_INTERFACES_MAX}
+| | ... | Fatal Error | Datapath length exceeded
+| | ${duts_count}= | Get Length | ${duts}
+| | Set Suite Variable | ${duts}
+| | Set Suite Variable | ${duts_count}
+| | FOR | ${action} | IN | @{actions}
 | | | Run Keyword | Additional Suite setup Action For ${action}
+| | END
 
 | Setup suite double link
 | | [Documentation]
@@ -91,10 +154,10 @@
 | | ... | Compute path for testing on three given nodes in circular topology
 | | ... | with double link between DUTs based on interface model provided as an
 | | ... | argument and set corresponding suite variables.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${actions} - Additional setup action. Type: list
-| | ...
+| |
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - duts - List of DUT nodes
 | | ... | - duts_count - Number of DUT nodes.
@@ -111,9 +174,9 @@
 | | ... | - dut2_if1_1 - DUT2 interface 1 towards DUT1.
 | | ... | - dut2_if1_2 - DUT2 interface 2 towards DUT1.
 | | ... | - dut2_if2 - DUT2 interface towards TG.
-| | ...
+| |
 | | [Arguments] | @{actions}
-| | ...
+| |
 | | ${nic_model_list}= | Create list | ${nic_name}
 | | # Compute path TG - DUT1 with single link in between
 | | Append Node | ${nodes['TG']}
@@ -160,8 +223,26 @@
 | | Set Suite Variable | ${dut2_if1_1}
 | | Set Suite Variable | ${dut2_if1_2}
 | | Set Suite Variable | ${dut2_if2}
-| | :FOR | ${action} | IN | @{actions}
+| | FOR | ${action} | IN | @{actions}
 | | | Run Keyword | Additional Suite setup Action For ${action}
+| | END
+
+| Additional Suite Setup Action For scapy
+| | [Documentation]
+| | ... | Additional Setup for suites which uses scapy as Traffic generator.
+| |
+| | Set Interface State | ${tg} | ${tg_if1} | up
+| | Set Interface State | ${tg} | ${tg_if2} | up
+
+| Additional Suite Setup Action For dpdk
+| | [Documentation]
+| | ... | Additional Setup for suites which uses dpdk.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | ${dut_str}= | Convert To Lowercase | ${dut}
+| | | Initialize DPDK Environment | ${nodes['${dut}']}
+| | | ... | ${${dut_str}_if1} | ${${dut_str}_if2}
+| | END
 
 | Additional Suite Setup Action For performance
 | | [Documentation]
@@ -174,28 +255,28 @@
 | | ... | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${osi_layer}
 
-| Additional Suite Setup Action For dpdk
+| Additional Suite Setup Action For performance_rdma
 | | [Documentation]
-| | ... | Additional Setup for suites which uses dpdk.
+| | ... | Additional Setup for suites which uses performance measurement with
+| | ... | RDMA-core driver.
 | | ...
-| | :FOR | ${dut} | IN | @{duts}
-| | | ${dut_str}= | Convert To Lowercase | ${dut}
-| | | Initialize DPDK Environment | ${nodes['${dut}']}
-| | | ... | ${${dut_str}_if1} | ${${dut_str}_if2}
+# TODO: Add functionality for tests that need some.
+| | Additional Suite Setup Action For performance
 
 | Additional Suite Setup Action For performance_avf
 | | [Documentation]
 | | ... | Additional Setup for suites which uses performance measurement over
 | | ... | SRIOV AVF.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | ${if1_avf_arr}= | Init AVF interface | ${nodes['${dut}']} | ${${dut}_if1}
 | | | ... | numvfs=${1} | osi_layer=${osi_layer}
 | | | ${if2_avf_arr}= | Init AVF interface | ${nodes['${dut}']} | ${${dut}_if2}
 | | | ... | numvfs=${1} | osi_layer=${osi_layer}
-# Currently only one AVF is supported.
+| | # Currently only one AVF is supported.
 | | | Set Suite Variable | ${${dut}_if1_vf0} | ${if1_avf_arr[0]}
 | | | Set Suite Variable | ${${dut}_if2_vf0} | ${if2_avf_arr[0]}
+| | END
 | | Run Keyword If | ${duts_count} == 1
 | | ... | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1_vf0} | ${dut1} | ${dut1_if2_vf0} | ${osi_layer}
@@ -203,10 +284,20 @@
 | | ... | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1_vf0} | ${dut2} | ${dut2_if2_vf0} | ${osi_layer}
 
+| Additional Suite Setup Action For avf
+| | [Documentation]
+| | ... | Additional Setup for suites which uses SRIOV AVF.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | # Currently only one AVF is supported.
+| | | Set Suite Variable | ${${dut}_if1_vf0} | ${${dut}_if1}
+| | | Set Suite Variable | ${${dut}_if2_vf0} | ${${dut}_if2}
+| | END
+
 | Additional Suite Setup Action For ipsechw
 | | [Documentation]
 | | ... | Additional Setup for suites which uses QAT HW.
-| | ...
+| |
 | | ${numvfs}= | Set Variable If
 | | ... | '${crypto_type}' == 'HW_DH895xcc' | ${32}
 | | ... | '${crypto_type}' == 'HW_C3xxx' | ${16}
@@ -217,7 +308,8 @@
 | Additional Suite Setup Action For wrk
 | | [Documentation]
 | | ... | Additional Setup for suites which uses WRK TG.
-| | ...
+| |
+| | Verify Program Installed | ${tg} | wrk
 | | Iface update numa node | ${tg}
 # Make sure TRex is stopped
 | | ${running}= | Is TRex running | ${tg}
@@ -234,13 +326,11 @@
 # Set IP on tg_if1
 | | ${intf_name}= | Get Linux interface name | ${tg}
 | | ... | ${tg['interfaces']['${tg_if1}']['pci_address']}
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.10.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.20.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.30.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.40.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.50.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.60.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.70.1 | 24
-| | Set Linux interface IP | ${tg} | ${intf_name} | 192.168.80.1 | 24
+| | FOR | ${ip_addr} | IN | @{wrk_ip_addrs}
+| | | ${ip_addr_on_intf}= | Linux interface has IP | ${tg} | ${intf_name}
+| | | ... | ${ip_addr} | ${wrk_ip_prefix}
+| | | Run Keyword If | ${ip_addr_on_intf}==${False} | Set Linux interface IP
+| | | ... | ${tg} | ${intf_name} | ${ip_addr} | ${wrk_ip_prefix}
+| | END
 | | Set Linux interface up | ${tg} | ${intf_name}
-| | Install wrk | ${tg}
+| | Check wrk | ${tg}