Revert "vpp-device: GENEVE tunnel test, l3 mode"

This reverts commit a9f54ca5080aeef17686f300a6807bf9b46b7c90.

Reason for revert: DO NOT MERGE BROKEN TESTS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

https://logs.fd.io/production/vex-yul-rot-jenkins-1/csit-vpp-device-master-ubuntu1804-1n-skx/9918/archives/log.html.gz


Change-Id: I2ce2970a43e5dd7487eeb54d1ccbb149e06cf8fa
Signed-off-by: pmikus <pmikus@cisco.com>

1 files changed, 63 insertions, 73 deletions

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index d6df417db1..c3d1e8a5ca 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -61,22 +61,30 @@
 | | END
 | | Clean Sockets On All Nodes | ${nodes}
 
-# Additional Test Tear Down Actions in alphabetical order
-| Additional Test Tear Down Action For acl
+| Additional Test Tear Down Action For performance
 | | [Documentation]
-| | ... | Additional teardown for tests which uses ACL feature.
+| | ... | Additional teardown for tests which uses performance measurement.
+| | ... | Optionally, call \${resetter} (if defined) to reset DUT state.
 | |
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Settings | ${dut1}
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+| | ... | 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 classify
+| Additional Test Tear Down Action For packet_trace
 | | [Documentation]
-| | ... | Additional teardown for tests which uses classify tables.
+| | ... | Additional teardown for tests which uses packet trace.
 | |
-| | Run Keyword If Test Failed
-| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
+| | Show Packet Trace on All DUTs | ${nodes}
 
 | Additional Test Tear Down Action For container
 | | [Documentation]
@@ -86,40 +94,42 @@
 | | | Destroy all '${container_group}' containers
 | | END
 
-| Additional Test Tear Down Action For det44
+| Additional Test Tear Down Action For vhost
 | | [Documentation]
-| | ... | Additional teardown for tests which uses DET44 feature.
+| | ... | Additional teardown for tests which uses vhost(s) and VM(s).
 | |
-| | FOR | ${dut} | IN | @{duts}
-| | | Run Keyword If Test Failed
-| | | ... | Show DET44 verbose | ${nodes['${dut}']}
-| | END
+| | 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 geneve4
+| Additional Test Tear Down Action For vhost-pt
 | | [Documentation]
-| | ... | Additional teardown for tests which uses GENEVE IPv4 tunnel.
+| | ... | Additional teardown for tests which uses pci-passtrough and VM(s).
 | |
-| | FOR | ${dut} | IN | @{duts}
-| | | Run Keyword If Test Failed
-| | | ... | Show Geneve Tunnel Data | ${nodes['${dut}']}
-| | END
+| | ${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 linux_bridge
+| Additional Test Tear Down Action For det44
 | | [Documentation]
-| | ... | Additional teardown for tests which uses linux_bridge.
+| | ... | Additional teardown for tests which uses DET44 feature.
 | |
 | | FOR | ${dut} | IN | @{duts}
-| | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
+| | | Run Keyword If Test Failed
+| | | ... | Show DET44 verbose | ${nodes['${dut}']}
 | | END
 
-| Additional Test Tear Down Action For macipacl
+| Additional Test Tear Down Action For nat-ed
 | | [Documentation]
-| | ... | Additional teardown for tests which uses MACIP ACL feature.
+| | ... | Additional teardown for tests which uses NAT feature.
 | |
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Macip Acl Settings | ${dut1}
-| | Run Keyword If Test Failed
-| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+| | 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 namespace
 | | [Documentation]
@@ -129,41 +139,38 @@
 | | | Clean Up Namespaces | ${nodes['${dut}']}
 | | END
 
-| Additional Test Tear Down Action For nat-ed
+| Additional Test Tear Down Action For linux_bridge
 | | [Documentation]
-| | ... | Additional teardown for tests which uses NAT feature.
+| | ... | Additional teardown for tests which uses linux_bridge.
 | |
 | | 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}']}
+| | | Linux Del Bridge | ${nodes['${dut}']} | ${bid_TAP}
 | | END
 
-| Additional Test Tear Down Action For packet_trace
+| Additional Test Tear Down Action For acl
 | | [Documentation]
-| | ... | Additional teardown for tests which uses packet trace.
+| | ... | Additional teardown for tests which uses ACL feature.
 | |
-| | Show Packet Trace on All DUTs | ${nodes}
+| | 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 performance
+| Additional Test Tear Down Action For macipacl
 | | [Documentation]
-| | ... | Additional teardown for tests which uses performance measurement.
-| | ... | Optionally, call \${resetter} (if defined) to reset DUT state.
+| | ... | Additional teardown for tests which uses MACIP ACL feature.
 | |
-| | ... | TODO: Document what test variables are required or optional.
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Macip Acl Settings | ${dut1}
+| | Run Keyword If Test Failed
+| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+
+| Additional Test Tear Down Action For classify
+| | [Documentation]
+| | ... | Additional teardown for tests which uses classify tables.
 | |
-| | 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}
+| | Run Keyword If Test Failed
+| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
 
 | Additional Test Tear Down Action For srv6
 | | [Documentation]
@@ -175,20 +182,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 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