From 7de465c09018b1cf739a28992fe198ccd5f5699d Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 13 Nov 2019 13:30:48 +0000 Subject: LIGATO: Remove Signed-off-by: Peter Mikus Change-Id: I0c9b8b07ed3a113e24a38faaddd5ed06fae67768 --- resources/libraries/robot/shared/default.robot | 67 ---------------------- resources/libraries/robot/shared/test_setup.robot | 16 ------ .../libraries/robot/shared/test_teardown.robot | 10 ---- 3 files changed, 93 deletions(-) (limited to 'resources/libraries/robot/shared') diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 8bad73d70e..c0b61fcea9 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -369,70 +369,3 @@ | | Vpp Show Errors On All DUTs | ${nodes} | | Verify VPP PID in Teardown | | Clean Sockets On All Nodes | ${nodes} - -# TODO: Cleanup when ligato is gone. -| Create Kubernetes VSWITCH startup config on all DUTs -| | [Documentation] | Create base startup configuration of VSWITCH in Kubernetes -| | ... | deploy to all DUTs. -| | ... -| | ... | *Arguments:* -| | ... | - ${jumbo} - Jumbo packet. Type: boolean -| | ... | - ${phy_cores} - Physical cores. Type: integer -| | ... | - ${rxq} - RX queues. Type: integer -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Create Kubernetes VSWITCH startup config on all DUTs \| ${True} \ -| | ... | \| ${1} \| ${1} -| | ... -| | [Arguments] | ${phy_cores} | ${rx_queues}=${None} | ${jumbo}=${False} -| | ... -| | ${cpu_count_int} | Convert to Integer | ${phy_cores} -| | ${thr_count_int} | Convert to Integer | ${phy_cores} -| | :FOR | ${dut} | IN | @{duts} -| | | ${numa}= | Get interfaces numa node | ${nodes['${dut}']} -| | | ... | ${${dut}_if1} | ${${dut}_if2} -| | | ${smt_used}= | Is SMT enabled | ${nodes['${dut}']['cpuinfo']} -| | | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if1} -| | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | ${${dut}_if2} -| | | ${thr_count_int}= | Run keyword if | ${smt_used} -| | | ... | Evaluate | int(${cpu_count_int}*2) -| | | ... | ELSE | Set variable | ${thr_count_int} -| | | ${rxq_count_int}= | Run keyword if | ${rx_queues} -| | | ... | Set variable | ${rx_queues} -| | | ... | ELSE | Evaluate | int(${thr_count_int}/2) -| | | ${rxq_count_int}= | Run keyword if | ${rxq_count_int} == 0 -| | | ... | Set variable | ${1} -| | | ... | ELSE | Set variable | ${rxq_count_int} -| | | ${config}= | Run keyword | Create Kubernetes VSWITCH startup config -| | | ... | node=${nodes['${dut}']} | phy_cores=${phy_cores} -| | | ... | cpu_node=${numa} | jumbo=${jumbo} | rxq_count_int=${rxq_count_int} -| | | ... | buffers_per_numa=${215040} -| | | ... | filename=/tmp/vswitch.conf | if1=${if1_pci} | if2=${if2_pci} -| | | Run keyword if | ${thr_count_int} > 1 -| | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD -| | | Set Tags | ${thr_count_int}T${cpu_count_int}C -| | Set Test Variable | ${smt_used} -| | Set Test Variable | ${thr_count_int} -| | Set Test Variable | ${cpu_count_int} -| | Set Test Variable | ${rxq_count_int} - -# TODO: Cleanup when ligato is gone. -| Create Kubernetes VNF'${i}' startup config on all DUTs -| | [Documentation] | Create base startup configuration of VNF in Kubernetes -| | ... | deploy to all DUTs. -| | ... -| | ${i_int}= | Convert To Integer | ${i} -| | ${cpu_skip}= | Evaluate | ${vswitch_cpus}+${system_cpus} -| | ${dut1_numa}= | Get interfaces numa node | ${dut1} -| | ... | ${dut1_if1} | ${dut1_if2} -| | ${dut2_numa}= | Get interfaces numa node | ${dut2} -| | ... | ${dut2_if1} | ${dut2_if2} -| | ${config}= | Run keyword | Create Kubernetes VNF startup config -| | ... | node=${dut1} | phy_cores=${vnf_cpus} | cpu_node=${dut1_numa} -| | ... | cpu_skip=${cpu_skip} | filename=/tmp/vnf${i}.conf -| | ... | i=${i_int} -| | ${config}= | Run keyword | Create Kubernetes VNF startup config -| | ... | node=${dut2} | phy_cores=${vnf_cpus} | cpu_node=${dut2_numa} -| | ... | cpu_skip=${cpu_skip} | filename=/tmp/vnf${i}.conf -| | ... | i=${i_int} diff --git a/resources/libraries/robot/shared/test_setup.robot b/resources/libraries/robot/shared/test_setup.robot index 17e9e6c459..c90ed68a79 100644 --- a/resources/libraries/robot/shared/test_setup.robot +++ b/resources/libraries/robot/shared/test_setup.robot @@ -39,19 +39,3 @@ | | ... | | :FOR | ${dut} | IN | @{duts} | | | Clean Up Namespaces | ${nodes['${dut}']} - -| Additional Test Setup Action For ligato -| | [Documentation] -| | ... | Additional Setup for tests which uses Ligato Kubernetes. -| | ... -| | Apply Kubernetes resource on all duts | ${nodes} | namespaces/csit.yaml -| | Apply Kubernetes resource on all duts | ${nodes} | pods/kafka.yaml -| | Apply Kubernetes resource on all duts | ${nodes} | pods/etcdv3.yaml -| | Apply Kubernetes resource on all duts | ${nodes} -| | ... | configmaps/vswitch-agent-cfg.yaml -| | Apply Kubernetes resource on all duts | ${nodes} -| | ... | configmaps/vnf-agent-cfg.yaml -| | Apply Kubernetes resource on all duts | ${nodes} -| | ... | pods/contiv-sfc-controller.yaml -| | Apply Kubernetes resource on all duts | ${nodes} -| | ... | pods/contiv-vswitch.yaml diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot index 0beeff4484..336cff5dad 100644 --- a/resources/libraries/robot/shared/test_teardown.robot +++ b/resources/libraries/robot/shared/test_teardown.robot @@ -129,13 +129,3 @@ | | ... | Show SR Steering Policies on all DUTs | ${nodes} | | Run Keyword If Test Failed | | ... | Show SR LocalSIDs on all DUTs | ${nodes} - -| Additional Test Tear Down Action For ligato -| | [Documentation] -| | ... | Additional teardown for performance tests with Ligato. -| | ... -| | Run Keyword If Test Failed -| | ... | Get Kubernetes logs on all DUTs | ${nodes} | csit -| | Run Keyword If Test Failed -| | ... | Describe Kubernetes resource on all DUTs | ${nodes} | csit -| | Delete Kubernetes resource on all DUTs | ${nodes} | csit -- cgit 1.2.3-korg