X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Ffunc%2Fpolicer%2Fpolicer_ip6.robot;h=6a7ae1a306c8648f30565ae3b9d5857514f10427;hb=c232d04e7a5bffb72063240ee7e15967f46c4873;hp=fb4fa9ce7c8c7f4fc25263698a3b5bbb9d279d11;hpb=c9d198a9f6494558574238dd055a14ef3a251d31;p=csit.git

diff --git a/tests/func/policer/policer_ip6.robot b/tests/func/policer/policer_ip6.robot
index fb4fa9ce7c..6a7ae1a306 100644
--- a/tests/func/policer/policer_ip6.robot
+++ b/tests/func/policer/policer_ip6.robot
@@ -11,22 +11,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-*** Variables ***
-| ${tg_to_dut_if1_ip6}= | 3ffe:5f::2
-| ${tg_to_dut_if2_ip6}= | 3ffe:60::2
-| ${dut_to_tg_if1_ip6}= | 3ffe:5f::1
-| ${dut_to_tg_if2_ip6}= | 3ffe:60::1
-| ${ip6_plen}= | ${64}
-
 *** Settings ***
 | 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 IPv6 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 | *IPv6 policer test cases*
 | ...
 | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\
@@ -37,20 +28,59 @@
 | ... | to DUT1. Packet is received on TG on the second link from DUT1.
 | ... | *[Ref] Applicable standard specifications:* RFC2474, RFC2697, RFC2698.
 
+*** Variables ***
+| ${tg_to_dut_if1_ip6}= | 3ffe:5f::2
+| ${tg_to_dut_if2_ip6}= | 3ffe:60::2
+| ${dut_to_tg_if1_ip6}= | 3ffe:5f::1
+| ${dut_to_tg_if2_ip6}= | 3ffe:60::1
+| ${ip6_plen}= | ${64}
+
+| ${cir}= | ${100}
+| ${eir}= | ${150}
+| ${cb}= | ${200}
+| ${eb}= | ${300}
+
 *** Test Cases ***
-| TC01: VPP policer marks packet
+| TC01: VPP policer 2R3C Color-aware marks packet
 | | [Documentation]
 | | ... | [Top] TG=DUT1.
 | | ... | [Ref] RFC2474, RFC2698.
 | | ... | [Cfg] On DUT1 configure 2R3C color-aware policer on the first\
 | | ... | interface.
-| | ... | [Ver] TG sends IPv6 TCP packet on the first link to DUT1, verify if\
-| | ... | DUT1 sends correct IPv6 TCP packet with correct DSCP on the second\
-| | ... | link to TG.
-| | ${cir}= | Set Variable | ${100}
-| | ${eir}= | Set Variable | ${100}
-| | ${cb}= | Set Variable | ${100}
-| | ${eb}= | Set Variable | ${100}
+| | ... | [Ver] TG sends IPv6 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv6 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}
+| | And Policer Set CIR | ${cir}
+| | And Policer Set EIR | ${eir}
+| | And Policer Set CB | ${cb}
+| | And Policer Set EB | ${eb}
+| | And Policer Set Rate Type pps
+| | And Policer Set Round Type Closest
+| | And Policer Set Type 2R3C 2698
+| | And Policer Set Conform Action Transmit
+| | And Policer Set Exceed Action Mark and Transmit | ${dscp}
+| | And Policer Set Violate Action Drop
+| | And Policer Enable Color Aware
+| | And Policer Classify Set Precolor Exceed
+| | And Policer Classify Set Interface | ${dut_to_tg_if1}
+| | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip}
+| | When Policer Set Configuration
+| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
+| | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}
+
+| TC02: VPP policer 2R3C Color-blind marks packet
+| | [Documentation]
+| | ... | [Top] TG=DUT1.
+| | ... | [Ref] RFC2474, RFC2698.
+| | ... | [Cfg] On DUT1 configure 2R3C color-blind policer on the first\
+| | ... | interface.
+| | ... | [Ver] TG sends IPv6 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv6 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}
@@ -61,6 +91,35 @@
 | | And Policer Set Rate Type pps
 | | And Policer Set Round Type Closest
 | | And Policer Set Type 2R3C 2698
+| | And Policer Set Conform Action Mark and Transmit | ${dscp}
+| | And Policer Set Exceed Action Transmit
+| | And Policer Set Violate Action Drop
+| | And Policer Classify Set Precolor Conform
+| | And Policer Classify Set Interface | ${dut_to_tg_if1}
+| | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip}
+| | When Policer Set Configuration
+| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
+| | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}
+
+| TC03: VPP policer 1R3C Color-aware marks packet
+| | [Documentation]
+| | ... | [Top] TG=DUT1.
+| | ... | [Ref] RFC2474, RFC2697.
+| | ... | [Cfg] On DUT1 configure 1R3C color-aware policer on the first\
+| | ... | interface.
+| | ... | [Ver] TG sends IPv6 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv6 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}
+| | And Policer Set CIR | ${1}
+| | And Policer Set CB | ${2}
+| | And Policer Set EB | ${eb}
+| | And Policer Set Rate Type pps
+| | And Policer Set Round Type Closest
+| | And Policer Set Type 1R3C
 | | And Policer Set Conform Action Transmit
 | | And Policer Set Exceed Action Mark and Transmit | ${dscp}
 | | And Policer Set Violate Action Drop
@@ -72,3 +131,31 @@
 | | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1}
 | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
 | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}
+
+| TC04: VPP policer 1R3C Color-blind marks packet
+| | [Documentation]
+| | ... | [Top] TG=DUT1.
+| | ... | [Ref] RFC2474, RFC2697.
+| | ... | [Cfg] On DUT1 configure 1R3C color-blind policer on the first\
+| | ... | interface.
+| | ... | [Ver] TG sends IPv6 TCP packet on the first link to DUT1.\
+| | ... | On DUT1 packet is marked with DSCP tag. Verify if DUT1 sends\
+| | ... | correct IPv6 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}
+| | And Policer Set CIR | ${cir}
+| | And Policer Set CB | ${cb}
+| | And Policer Set Rate Type pps
+| | And Policer Set Round Type Closest
+| | And Policer Set Type 1R3C
+| | And Policer Set Conform Action Mark and Transmit | ${dscp}
+| | And Policer Set Exceed Action Transmit
+| | And Policer Set Violate Action Drop
+| | And Policer Classify Set Precolor Conform
+| | And Policer Classify Set Interface | ${dut_to_tg_if1}
+| | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip}
+| | When Policer Set Configuration
+| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1}
+| | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac}
+| | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}