CSIT-377, CSIT-379 QoS policer tests

  Add IPv6 tests:
  - VPP 1r3c-ca policing packets based on packet classify
  - VPP 1r3c-cb policing packets based on packet classify
  - VPP 2r3c-cb policing packets based on packet classify

  Add IPv4 tests:
  - VPP 1r3c-ca policing packets based on packet classify
  - VPP 1r3c-cb policing packets based on packet classify
  - VPP 2r3c-cb policing packets based on packet classify

Change-Id: Iba9674232792fb5b7b90ae6f2ca8fd392595947a
Signed-off-by: Patrik Hrnciar <phrnciar@cisco.com>

2 files changed, 196 insertions, 17 deletions

diff --git a/tests/func/policer/policer_ip4.robot b/tests/func/policer/policer_ip4.robot
index 28023b8641..a8113df055 100644
--- a/tests/func/policer/policer_ip4.robot
+++ b/tests/func/policer/policer_ip4.robot
@@ -37,8 +37,13 @@
 | ${dut_to_tg_if2_ip4}= | 192.168.123.1
 | ${ip4_plen}= | ${24}
 
+| ${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.
@@ -47,10 +52,6 @@
 | | ... | [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.
-| | ${cir}= | Set Variable | ${100}
-| | ${eir}= | Set Variable | ${100}
-| | ${cb}= | Set Variable | ${100}
-| | ${eb}= | Set Variable | ${100}
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}
@@ -72,3 +73,92 @@
 | | 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 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.
+| | ${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 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 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.
+| | ${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
+| | 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}
+
+| 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 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.
+| | ${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 EB | ${eb}
+| | 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}
\ No newline at end of file
diff --git a/tests/func/policer/policer_ip6.robot b/tests/func/policer/policer_ip6.robot
index fb4fa9ce7c..f980247e03 100644
--- a/tests/func/policer/policer_ip6.robot
+++ b/tests/func/policer/policer_ip6.robot
@@ -11,13 +11,6 @@
 # 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
@@ -37,8 +30,20 @@
 | ... | 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.
@@ -47,10 +52,6 @@
 | | ... | [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}
 | | ${dscp}= | DSCP AF22
 | | Given Policer Set Name | policer1
 | | And Policer Set Node | ${dut_node}
@@ -72,3 +73,91 @@
 | | 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, 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 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, 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
+| | 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}
+
+| 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, 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}