Func test reorg - decrease exec time per vpp patch

[csit.git] / tests / func / lisp / eth2p-ethip4ipsectptlispgpe-ip4base-func.robot

diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
index f3af311..b78dacb 100644 (file)
--- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
+++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot
@@ -33,11 +33,11 @@
 # Import configuration and test data:
 | Variables | resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py
 | ...
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH
 | ...
 | Test Setup | Func Test Setup
 | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ... | AND | Show vpp trace dump on all DUTs
+| ... | AND | Show VAT History On All DUTs | ${nodes}
 | ... | AND | Show Vpp Settings | ${nodes['DUT1']}
 | ... | AND | Show Vpp Settings | ${nodes['DUT2']}
 | ... | AND | Check VPP PID in Teardown
@@ -163,7 +163,7 @@
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology | ${fib_table_1}
-| | And Add IP Neighbors | ${fib_table_1}
+| | And Add IP Neighbors
 | | When IPsec Generate Keys | ${encr_alg} | ${auth_alg}
 | | And Set up LISP GPE topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
@@ -205,7 +205,7 @@
 | | ${encr_alg}= | Crypto Alg AES CBC 128
 | | ${auth_alg}= | Integ Alg SHA1 96
 | | Given Setup 3-node Topology | ${fib_table_1}
-| | And Add IP Neighbors | ${fib_table_1}
+| | And Add IP Neighbors
 | | And Set up LISP GPE topology
 | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE}
 | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE}
@@ -260,14 +260,12 @@
 
 | Add IP Neighbors
 | | [Documentation]
-| | ... | Add IP neighbors to physical interfaces on DUTs.\
-| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0.
+| | ... | Add IP neighbors to physical interfaces on DUTs.
 | | ...
-| | [Arguments] | ${fib_id}=0
 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4}
-| | ... | ${tg_to_dut1_mac} | ${fib_id}
+| | ... | ${tg_to_dut1_mac}
 | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4}
-| | ... | ${tg_to_dut2_mac} | ${fib_id}
+| | ... | ${tg_to_dut2_mac}
 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4}
 | | ... | ${dut2_to_dut1_mac}
 | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4}