From 80adeefab9fc1871675688881498304ddc780828 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 13 Jul 2020 14:08:13 +0200 Subject: Remove remains of WRK tests Change-Id: If61783fb717757c6189f06924412bd079e15a08f Signed-off-by: Tibor Frank --- resources/libraries/robot/shared/suite_setup.robot | 32 ---------------------- .../libraries/robot/shared/suite_teardown.robot | 17 ------------ 2 files changed, 49 deletions(-) (limited to 'resources/libraries/robot/shared') diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot index 05e8fe8e91..a9e57e7024 100644 --- a/resources/libraries/robot/shared/suite_setup.robot +++ b/resources/libraries/robot/shared/suite_setup.robot @@ -19,9 +19,7 @@ | Library | resources.libraries.python.NodePath | 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 *** @@ -200,33 +198,3 @@ | | Configure crypto device on all DUTs | ${crypto_type} | numvfs=${numvfs} | | ... | force_init=${True} | | Configure kernel module on all DUTs | vfio_pci | force_load=${True} - -| 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} -| | Run keyword if | ${running}==${True} | Teardown traffic generator | ${tg} -| | ${curr_driver}= | Get PCI dev driver | ${tg} -| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} -| | Run keyword if | '${curr_driver}'!='${None}' -| | ... | PCI Driver Unbind | ${tg} | -| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} -# Bind tg_if1 to driver specified in the topology -| | ${driver}= | Get Variable Value | ${tg['interfaces']['${tg_if1}']['driver']} -| | PCI Driver Bind | ${tg} -| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} | ${driver} -# Set IP on tg_if1 -| | ${intf_name}= | Get Linux interface name | ${tg} -| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} -| | 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} -| | Check wrk | ${tg} diff --git a/resources/libraries/robot/shared/suite_teardown.robot b/resources/libraries/robot/shared/suite_teardown.robot index f76fddc9d6..f164b0eeb5 100644 --- a/resources/libraries/robot/shared/suite_teardown.robot +++ b/resources/libraries/robot/shared/suite_teardown.robot @@ -50,23 +50,6 @@ | | | ... | ${nodes['${dut}']} | ${${dut}_${int}1}[0] | ${${dut}_${int}2}[0] | | END -| Additional Suite Tear Down Action For wrk -| | [Documentation] -| | ... | Additional teardown for suites which uses wrk. -| | -| | ${intf_name}= | Get Linux interface name | ${tg} -| | ... | ${tg['interfaces']['${tg_if1}']['pci_address']} -| | 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}==${True} | Delete Linux Interface IP -| | | ... | ${tg} | ${intf_name} | ${ip_addr} | ${wrk_ip_prefix} -| | END -| | Run Keyword And Ignore Error | PCI Driver Unbind -| | ... | ${tg} | ${tg['interfaces']['${tg_if1}']['pci_address']} -| | Run Keyword And Ignore Error | PCI Driver Unbind -| | ... | ${tg} | ${tg['interfaces']['${tg_if2}']['pci_address']} - | Additional Suite Tear Down Action For hoststack | | [Documentation] | | ... | Additional teardown for suites which uses hoststack test programs. -- cgit 1.2.3-korg