Improve pf layer

[csit.git] / resources / libraries / robot / features / policer.robot

diff --git a/resources/libraries/robot/features/policer.robot b/resources/libraries/robot/features/policer.robot
index 962f4cf..a9394d6 100644 (file)
--- a/resources/libraries/robot/features/policer.robot
+++ b/resources/libraries/robot/features/policer.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,7 +14,7 @@
 *** Settings ***
 | Library | resources.libraries.python.Classify
 | Library | resources.libraries.python.Policer
-| ...
+|
 | Documentation | Policer keywords
 
 *** Keywords ***
@@ -23,7 +23,7 @@
 | | ... | Setup of 2r3c color-aware or color-blind policer with dst IPv4 match
 | | ... | on all DUT nodes in 2-node / 3-node circular topology. Policer is
 | | ... | applied on links TG - DUTx.
-| | ...
+| |
 | | ${policer_index}= | Policer Set Configuration | ${dut1} | policer1 | ${cir}
 | | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
 | | ... | Mark_and_Transmit | Transmit | ${t} | exceed_dscp=${dscp}
@@ -33,18 +33,19 @@
 | | Vpp Configures Classify Session L3 | ${dut1} | permit | ${table_idx}
 | | ... | ${skip_n} | ${match_n} | ip4 | dst | 20.20.20.2
 | | ... | hit_next_index=${policer_index} | opaque_index=${pre_color}
-| | Policer Classify Set Interface | ${dut1} | ${dut1_if1}
+| | Policer Classify Set Interface
+| | ... | ${dut1} | ${DUT1_${int}1}[0]
 | | ... | ip4_table_index=${table_idx}
-| | ...
+| |
 | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Variable Should Exist | ${dut2}
 | | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | ${dut2}
 | | ... | ELSE | Set Variable | ${dut1}
 | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | ${dut2_if2}
-| | ... | ELSE | Set Variable | ${dut1_if2}
-| | ...
+| | ... | Set Variable | ${DUT2_${int}2}[0]
+| | ... | ELSE | Set Variable | ${DUT1_${int}2}[0]
+| |
 | | ${policer_index}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Policer Set Configuration | ${dut} | policer2 | ${cir}
 | | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
@@ -65,7 +66,7 @@
 | | ... | Setup of 2r3c color-aware or color-blind policer with dst IPv6 match
 | | ... | on all DUT nodes in 2-node / 3-node circular topology. Policer is
 | | ... | applied on links TG - DUTx.
-| | ...
+| |
 | | ${policer_index}= | Policer Set Configuration | ${dut1} | policer1 | ${cir}
 | | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
 | | ... | Mark_and_Transmit | Transmit | ${t} | exceed_dscp=${dscp}
@@ -75,18 +76,18 @@
 | | Vpp Configures Classify Session L3 | ${dut1} | permit | ${table_idx}
 | | ... | ${skip_n} | ${match_n} | ip6 | dst | 2001:2::2
 | | ... | hit_next_index=${policer_index} | opaque_index=${pre_color}
-| | Policer Classify Set Interface | ${dut1} | ${dut1_if1}
+| | Policer Classify Set Interface | ${dut1} | ${DUT1_${int}1}[0]
 | | ... | ip6_table_index=${table_idx}
-| | ...
+| |
 | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Variable Should Exist | ${dut2}
 | | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Set Variable | ${dut2}
 | | ... | ELSE | Set Variable | ${dut1}
 | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS'
-| | ... | Set Variable | ${dut2_if2}
-| | ... | ELSE | Set Variable | ${dut1_if2}
-| | ...
+| | ... | Set Variable | ${DUT2_${int}2}[0]
+| | ... | ELSE | Set Variable | ${DUT1_${int}2}[0]
+| |
 | | ${policer_index}= | Run Keyword If | '${dut2_status}' == 'PASS'
 | | ... | Policer Set Configuration | ${dut} | policer2 | ${cir}
 | | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
@@ -105,16 +106,16 @@
 
 | Show Classify Tables Verbose on all DUTs
 | | [Documentation] | Show classify tables verbose on all DUT nodes in topology.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - nodes - Topology. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show Classify Tables Verbose on all DUTs \| ${nodes} \|
-| | ...
+| |
 | | [Arguments] | ${nodes}
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Show Classify Tables Verbose | ${nodes['${dut}']}
+| | END