X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Ftest_teardown.robot;h=d6df417db1816df05729288f885b94063cb40a30;hb=0bb14d79edb065bc97fdd11a7bfa7d1605266e08;hp=e6ddc58c4bf2f20c0b4e06d7e1986d9e053f0a21;hpb=a40195bdda6ec06af8479cfe7d3b3e11d4c9778f;p=csit.git

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index e6ddc58c4b..d6df417db1 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -24,7 +24,7 @@
 *** Keywords ***
 | Tear down test
 | | [Documentation]
-| | ... | Common test teardown for tests.
+| | ... | Common test teardown for VPP tests.
 | |
 | | ... | *Arguments:*
 | | ... | - ${actions} - Additional teardown action. Type: list
@@ -46,20 +46,37 @@
 | | END
 | | Clean Sockets On All Nodes | ${nodes}
 
-| Additional Test Tear Down Action For performance
+| Tear down test raw
 | | [Documentation]
-| | ... | Additional teardown for tests which uses performance measurement.
+| | ... | Common test teardown for raw tests.
+| |
+| | ... | *Arguments:*
+| | ... | - ${actions} - Additional teardown action. Type: list
+| |
+| | [Arguments] | @{actions}
+| |
+| | Remove All Added Ports On All DUTs From Topology | ${nodes}
+| | FOR | ${action} | IN | @{actions}
+| | | Run Keyword | Additional Test Tear Down Action For ${action}
+| | END
+| | Clean Sockets On All Nodes | ${nodes}
+
+# Additional Test Tear Down Actions in alphabetical order
+| Additional Test Tear Down Action For acl
+| | [Documentation]
+| | ... | Additional teardown for tests which uses ACL feature.
 | |
 | | Run Keyword If Test Failed
-| | ... | Send traffic at specified rate | ${1.0} | 10000pps
-| | ... | ${frame_size} | ${traffic_profile} | trial_multiplicity=${1}
-| | ... | extended_debug=${True}
+| | ... | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
-| Additional Test Tear Down Action For packet_trace
+| Additional Test Tear Down Action For classify
 | | [Documentation]
-| | ... | Additional teardown for tests which uses packet trace.
+| | ... | Additional teardown for tests which uses classify tables.
 | |
-| | Show Packet Trace on All DUTs | ${nodes}
+| | Run Keyword If Test Failed
+| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
 
 | Additional Test Tear Down Action For container
 | | [Documentation]
@@ -69,30 +86,22 @@
 | | | Destroy all '${container_group}' containers
 | | END
 
-| Additional Test Tear Down Action For vhost
+| Additional Test Tear Down Action For det44
 | | [Documentation]
-| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
-| |
-| | Show VPP vhost on all DUTs | ${nodes}
-| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
-| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
-| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
-
-| Additional Test Tear Down Action For nat
-| | [Documentation]
-| | ... | Additional teardown for tests which uses NAT feature.
+| | ... | Additional teardown for tests which uses DET44 feature.
 | |
 | | FOR | ${dut} | IN | @{duts}
 | | | Run Keyword If Test Failed
-| | | ... | Show NAT verbose | ${nodes['${dut}']}
+| | | ... | Show DET44 verbose | ${nodes['${dut}']}
 | | END
 
-| Additional Test Tear Down Action For namespace
+| Additional Test Tear Down Action For geneve4
 | | [Documentation]
-| | ... | Additional teardown for tests which uses namespace.
+| | ... | Additional teardown for tests which uses GENEVE IPv4 tunnel.
 | |
 | | FOR | ${dut} | IN | @{duts}
-| | | Clean Up Namespaces | ${nodes['${dut}']}
+| | | Run Keyword If Test Failed
+| | | ... | Show Geneve Tunnel Data | ${nodes['${dut}']}
 | | END
 
 | Additional Test Tear Down Action For linux_bridge
@@ -103,15 +112,6 @@
 | | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
 | | END
 
-| Additional Test Tear Down Action For acl
-| | [Documentation]
-| | ... | Additional teardown for tests which uses ACL feature.
-| |
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Settings | ${dut1}
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
-
 | Additional Test Tear Down Action For macipacl
 | | [Documentation]
 | | ... | Additional teardown for tests which uses MACIP ACL feature.
@@ -121,12 +121,49 @@
 | | Run Keyword If Test Failed
 | | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
 
-| Additional Test Tear Down Action For classify
+| Additional Test Tear Down Action For namespace
 | | [Documentation]
-| | ... | Additional teardown for tests which uses classify tables.
+| | ... | Additional teardown for tests which uses namespace.
 | |
-| | Run Keyword If Test Failed
-| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
+| | FOR | ${dut} | IN | @{duts}
+| | | Clean Up Namespaces | ${nodes['${dut}']}
+| | END
+
+| Additional Test Tear Down Action For nat-ed
+| | [Documentation]
+| | ... | Additional teardown for tests which uses NAT feature.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Show NAT44 Config | ${nodes['${dut}']}
+| | | Show NAT44 Summary | ${nodes['${dut}']}
+| | | Show NAT Base Data | ${nodes['${dut}']}
+| | | Vpp Get Ip Table Summary | ${nodes['${dut}']}
+| | END
+
+| Additional Test Tear Down Action For packet_trace
+| | [Documentation]
+| | ... | Additional teardown for tests which uses packet trace.
+| |
+| | Show Packet Trace on All DUTs | ${nodes}
+
+| Additional Test Tear Down Action For performance
+| | [Documentation]
+| | ... | Additional teardown for tests which uses performance measurement.
+| | ... | Optionally, call \${resetter} (if defined) to reset DUT state.
+| |
+| | ... | TODO: Document what test variables are required or optional.
+| |
+| | Run Keyword If Test Passed | Return From Keyword
+| | ${use_latency} = | Get Use Latency
+| | ${rate_for_teardown} = | Get Rate For Teardown
+| | Call Resetter
+| | Set Test Variable | \${extended_debug} | ${True}
+| | Send traffic at specified rate
+| | ... | trial_duration=${1.0}
+| | ... | rate=${rate_for_teardown}
+| | ... | trial_multiplicity=${1}
+| | ... | use_latency=${use_latency}
+| | ... | duration_limit=${1.0}
 
 | Additional Test Tear Down Action For srv6
 | | [Documentation]
@@ -138,3 +175,20 @@
 | | ... | 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 vhost
+| | [Documentation]
+| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
+| |
+| | Show VPP vhost on all DUTs | ${nodes}
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
+
+| Additional Test Tear Down Action For vhost-pt
+| | [Documentation]
+| | ... | Additional teardown for tests which uses pci-passtrough and VM(s).
+| |
+| | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Keyword Should Exist | vnf_manager.Kill All VMs
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs