Func test reorg - decrease exec time per vpp patch

- remove tests covered by make test
- remove some negative tests

Change-Id: I35d641562ee85888f7d1dd60dd892689b1e9c52d
Signed-off-by: Jan Gelety <jgelety@cisco.com>
Signed-off-by: Maciek Konstantynowicz <mkonstan@cisco.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot
index 158dd896f1..71b3da4092 100644
--- a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot
+++ b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot
@@ -17,7 +17,7 @@
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/interfaces.robot
 | Resource | resources/libraries/robot/ipv4.robot
-| Force Tags | HW_ENV
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH
 | Suite Setup | Run Keywords
 | ... | Setup all DUTs before test | AND
 | ... | Setup all TGs before traffic script | AND
@@ -47,7 +47,7 @@
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Req to DUT ingress interface. Make TG\
 | | ... | verify ICMP Echo Reply is correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
+| | [Tags] | VM_ENV
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']}
 | | Compute Path
 | | ${src_port} | ${src_node}= | First Interface
@@ -56,10 +56,10 @@
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
 
 | TC02: DUT routes IPv4 to its egress interface
+| | [Tags] | VM_ENV
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Req towards DUT1 egress interface\
 | | ... | connected to DUT2. Make TG verify ICMPv4 Echo Reply is correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | Compute Path
 | | ${src_port} | ${src_node}= | First Interface
@@ -68,10 +68,10 @@
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
 
 | TC03: DUT1 routes IPv4 to DUT2 ingress interface
+| | [Tags] | VM_ENV
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Req towards DUT2 ingress interface\
 | | ... | connected to DUT1. Make TG verify ICMPv4 Echo Reply is correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | Compute Path
 | | ${src_port} | ${src_node}= | First Interface
@@ -80,10 +80,10 @@
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
 
 | TC04: DUT1 routes IPv4 to DUT2 egress interface
+| | [Tags] | VM_ENV
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Req towards DUT2 egress interface\
 | | ... | connected to TG. Make TG verify ICMPv4 Echo Reply is correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | Compute Path
 | | ${src_port} | ${src_node}= | First Interface
@@ -92,10 +92,10 @@
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
 
 | TC05: DUT1 and DUT2 route IPv4 between TG interfaces
+| | [Tags] | VM_ENV
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Req between its interfaces across DUT1\
 | | ... | and DUT2. Make TG verify ICMPv4 Echo Replies are correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']}
 | | Compute Path
 | | ${src_port} | ${src_node}= | First Interface
@@ -104,11 +104,11 @@
 | | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4
 
 | TC06: DUT replies to ICMPv4 Echo Reqs with size 64B-to-1500B-incr-1B
+| | [Tags] | VM_ENV
 | | [Documentation]
 | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\
 | | ... | incrementating frame size from 64B to 1500B with increment step
 | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1
 
 | TC07: DUT replies to ICMPv4 Echo Reqs with size 1500B-to-9000B-incr-10B
@@ -116,7 +116,6 @@
 | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\
 | | ... | incrementating frame size from 1500B to 9000B with increment
 | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct.
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO
 | | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']}
 | | [Teardown] | Run keywords
 | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']}
@@ -133,7 +132,7 @@
 | | ... | 1452 | ${end_size} | 10
 
 | TC08: DUT replies to ARP request
+| | [Tags] | VM_ENV | SKIP_VPP_PATCH
 | | [Documentation]
 | | ... | Make TG send ARP Request to DUT and verify ARP Reply is correct.\
-| | [Tags] | 3_NODE_SINGLE_LINK_TOPO | VM_ENV
 | | Send ARP request and validate response | ${nodes['TG']} | ${nodes['DUT1']}