CSIT-465: Common test setup and teardown

[csit.git] / tests / func / policer / policer_ip4.robot

diff --git a/tests/func/policer/policer_ip4.robot b/tests/func/policer/policer_ip4.robot
index a8113df..4cb3686 100644 (file)
--- a/tests/func/policer/policer_ip4.robot
+++ b/tests/func/policer/policer_ip4.robot
@@ -15,11 +15,9 @@
 | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV
 | Resource | resources/libraries/robot/policer.robot
 | Library | resources.libraries.python.Trace
-| Test Setup | Run Keywords | Setup all DUTs before test
-| ...        | AND          | Setup all TGs before traffic script
+| Test Setup | Run Keywords | Func Test Setup
 | ...        | AND          | Setup Topology for IPv4 policer testing
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ...           | AND          | Show vpp trace dump on all DUTs
+| Test Teardown | Func Test Teardown
 | Documentation | *IPv4 policer test cases*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\
@@ -49,9 +47,9 @@
 | | ... | [Ref] RFC2474, RFC2698.
 | | ... | [Cfg] On DUT1 configure 2R3C color-aware policer on the first\
 | | ... | interface.
-| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1, verify if\
-| | ... | DUT1 sends correct IPv4 TCP packet with correct DSCP on the second\
-| | ... | link to TG.
+| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG.
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}
@@ -80,9 +78,9 @@
 | | ... | [Ref] RFC2474, RFC2698.
 | | ... | [Cfg] On DUT1 configure 2R3C color-blind policer on the first\
 | | ... | interface.
-| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1, verify if\
-| | ... | DUT1 sends correct IPv4 TCP packet with correct DSCP on the second\
-| | ... | link to TG.
+| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG.
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}
@@ -110,9 +108,9 @@
 | | ... | [Ref] RFC2474, RFC2697.
 | | ... | [Cfg] On DUT1 configure 1R3C color-aware policer on the first\
 | | ... | interface.
-| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1, verify if\
-| | ... | DUT1 sends correct IPv4 TCP packet with correct DSCP on the second\
-| | ... | link to TG.
+| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG.
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}
@@ -140,9 +138,9 @@
 | | ... | [Ref] RFC2474, RFC2697.
 | | ... | [Cfg] On DUT1 configure 1R3C color-blind policer on the first\
 | | ... | interface.
-| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1, verify if\
-| | ... | DUT1 sends correct IPv4 TCP packet with correct DSCP on the second\
-| | ... | link to TG.
+| | ... | [Ver] TG sends IPv4 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG.
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}