aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot
diff options
context:
space:
mode:
authorpremkumarv <preym17@gmail.com>2019-07-24 08:43:23 -0400
committerJan Gelety <jgelety@cisco.com>2019-09-26 17:26:32 +0200
commit7b73d46872db5adfc8f4603a9ca783be7d3fa323 (patch)
treea04a2a21632d1f4b39a8eaebd24065b3cc8f4bcd /resources/libraries/robot
parentf7d43390a6ce60284f54cad4e66b66d1ecd4a166 (diff)
CSIT-1471: Policer - VAT API to PAPI
Change-Id: I6c7eff8d9cbb196ccb684a45579ac59942351cfe Signed-off-by: premkumarv <preym17@gmail.com>
Diffstat (limited to 'resources/libraries/robot')
-rw-r--r--resources/libraries/robot/features/policer.robot122
-rw-r--r--resources/libraries/robot/shared/default.robot2
-rw-r--r--resources/libraries/robot/shared/test_teardown.robot7
-rw-r--r--resources/libraries/robot/shared/traffic.robot1
4 files changed, 80 insertions, 52 deletions
diff --git a/resources/libraries/robot/features/policer.robot b/resources/libraries/robot/features/policer.robot
index 111b932a4b..962f4cf2be 100644
--- a/resources/libraries/robot/features/policer.robot
+++ b/resources/libraries/robot/features/policer.robot
@@ -12,6 +12,7 @@
# limitations under the License.
*** Settings ***
+| Library | resources.libraries.python.Classify
| Library | resources.libraries.python.Policer
| ...
| Documentation | Policer keywords
@@ -23,25 +24,18 @@
| | ... | on all DUT nodes in 2-node / 3-node circular topology. Policer is
| | ... | applied on links TG - DUTx.
| | ...
-| | ${dscp}= | DSCP AF22
-| | Policer Set Name | policer1
-| | Policer Set CIR | ${cir}
-| | Policer Set EIR | ${eir}
-| | Policer Set CB | ${cb}
-| | Policer Set EB | ${eb}
-| | Policer Set Rate Type pps
-| | Policer Set Round Type Closest
-| | Policer Set Type 2R3C 2698
-| | Policer Set Conform Action Transmit
-| | Policer Set Exceed Action Mark and Transmit | ${dscp}
-| | Policer Set Violate Action Transmit
-| | Policer Enable Color Aware
-| | Run Keyword If | ${t} == 'ca' | Policer Enable Color Aware
-| | Policer Classify Set Precolor Exceed
-| | Policer Set Node | ${dut1}
-| | Policer Classify Set Interface | ${dut1_if1}
-| | Policer Classify Set Match IP | 20.20.20.2 | ${False}
-| | Policer Set Configuration
+| | ${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}
+| | ${table_idx} | ${skip_n} | ${match_n}= | Vpp Creates Classify Table L3
+| | ... | ${dut1} | ip4 | dst | 255.255.255.255
+| | ${pre_color}= | Policer Classify Get Precolor | exceed_color
+| | 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}
+| | ... | ip4_table_index=${table_idx}
+| | ...
| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
| | ... | Variable Should Exist | ${dut2}
| | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS'
@@ -50,12 +44,21 @@
| | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS'
| | ... | Set Variable | ${dut2_if2}
| | ... | ELSE | Set Variable | ${dut1_if2}
-| | Run Keyword Unless | '${dut2_status}' == 'PASS'
-| | ... | Policer Set Name | policer2
-| | Policer Set Node | ${dut}
-| | Policer Classify Set Interface | ${dut_if2}
-| | Policer Classify Set Match IP | 10.10.10.2 | ${False}
-| | Policer Set Configuration
+| | ...
+| | ${policer_index}= | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Policer Set Configuration | ${dut} | policer2 | ${cir}
+| | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
+| | ... | Mark_and_Transmit | Transmit | ${t} | exceed_dscp=${dscp}
+| | ... | ELSE | Set Variable | ${policer_index}
+| | ${table_idx} | ${skip_n} | ${match_n}=
+| | ... | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Vpp Creates Classify Table L3 | ${dut} | ip4 | dst | 255.255.255.255
+| | ... | ELSE | Set Variable | ${table_idx} | ${skip_n} | ${match_n}
+| | Vpp Configures Classify Session L3 | ${dut} | permit | ${table_idx}
+| | ... | ${skip_n} | ${match_n} | ip4 | dst | 10.10.10.2
+| | ... | hit_next_index=${policer_index} | opaque_index=${pre_color}
+| | Policer Classify Set Interface | ${dut} | ${dut_if2}
+| | ... | ip4_table_index=${table_idx}
| Initialize IPv6 policer 2r3c-${t} in circular topology
| | [Documentation]
@@ -63,25 +66,18 @@
| | ... | on all DUT nodes in 2-node / 3-node circular topology. Policer is
| | ... | applied on links TG - DUTx.
| | ...
-| | ${dscp}= | DSCP AF22
-| | Policer Set Name | policer1
-| | Policer Set CIR | ${cir}
-| | Policer Set EIR | ${eir}
-| | Policer Set CB | ${cb}
-| | Policer Set EB | ${eb}
-| | Policer Set Rate Type pps
-| | Policer Set Round Type Closest
-| | Policer Set Type 2R3C 2698
-| | Policer Set Conform Action Transmit
-| | Policer Set Exceed Action Mark and Transmit | ${dscp}
-| | Policer Set Violate Action Transmit
-| | Policer Enable Color Aware
-| | Run Keyword If | ${t} == 'ca' | Policer Enable Color Aware
-| | Policer Classify Set Precolor Exceed
-| | Policer Set Node | ${dut1}
-| | Policer Classify Set Interface | ${dut1_if1}
-| | Policer Classify Set Match IP | 2001:2::2 | ${False}
-| | Policer Set Configuration
+| | ${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}
+| | ${table_idx} | ${skip_n} | ${match_n}= | Vpp Creates Classify Table L3
+| | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+| | ${pre_color}= | Policer Classify Get Precolor | exceed_color
+| | 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}
+| | ... | ip6_table_index=${table_idx}
+| | ...
| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error
| | ... | Variable Should Exist | ${dut2}
| | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS'
@@ -90,9 +86,35 @@
| | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS'
| | ... | Set Variable | ${dut2_if2}
| | ... | ELSE | Set Variable | ${dut1_if2}
-| | Run Keyword Unless | '${dut2_status}' == 'PASS'
-| | ... | Policer Set Name | policer2
-| | Policer Set Node | ${dut}
-| | Policer Classify Set Interface | ${dut_if2}
-| | Policer Classify Set Match IP | 2001:1::2 | ${False}
-| | Policer Set Configuration
+| | ...
+| | ${policer_index}= | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Policer Set Configuration | ${dut} | policer2 | ${cir}
+| | ... | ${eir} | ${cb} | ${eb} | pps | Closest | 2R3C_RFC_2698 | Transmit
+| | ... | Mark_and_Transmit | Transmit | ${t} | exceed_dscp=${dscp}
+| | ... | ELSE | Set Variable | ${policer_index}
+| | ${table_idx} | ${skip_n} | ${match_n}=
+| | ... | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Vpp Creates Classify Table L3
+| | ... | ${dut} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+| | ... | ELSE | Set Variable | ${table_idx} | ${skip_n} | ${match_n}
+| | Vpp Configures Classify Session L3 | ${dut} | permit | ${table_idx}
+| | ... | ${skip_n} | ${match_n} | ip6 | dst | 2001:1::2
+| | ... | hit_next_index=${policer_index} | opaque_index=${pre_color}
+| | Policer Classify Set Interface | ${dut} | ${dut_if2}
+| | ... | ip6_table_index=${table_idx}
+
+| 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}
+| | | Show Classify Tables Verbose | ${nodes['${dut}']}
diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot
index 8985bd2434..c560dcf8c2 100644
--- a/resources/libraries/robot/shared/default.robot
+++ b/resources/libraries/robot/shared/default.robot
@@ -20,7 +20,7 @@
| Library | OperatingSystem
| Library | String
| ...
-| Library | resources.libraries.python.Classify.Classify
+| Library | resources.libraries.python.Classify
| Library | resources.libraries.python.CpuUtils
| Library | resources.libraries.python.CoreDumpUtil
| Library | resources.libraries.python.Cop
diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index 8ba914b946..1cc526211d 100644
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -111,6 +111,13 @@
| | Run Keyword If Test Failed
| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+| Additional Test Tear Down Action For classify
+| | [Documentation]
+| | ... | Additional teardown for tests which uses classify tables.
+| | ...
+| | Run Keyword If Test Failed
+| | ... | Show Classify Tables Verbose on all DUTs | ${nodes}
+
| Additional Test Tear Down Action For srv6
| | [Documentation]
| | ... | Additional teardown for tests which uses SRv6.
diff --git a/resources/libraries/robot/shared/traffic.robot b/resources/libraries/robot/shared/traffic.robot
index 294d0a7deb..b3e030986e 100644
--- a/resources/libraries/robot/shared/traffic.robot
+++ b/resources/libraries/robot/shared/traffic.robot
@@ -571,7 +571,6 @@
| | [Arguments] | ${node} | ${tx_if} | ${rx_if} | ${src_mac} | ${dst_mac}
| | ... | ${src_ip} | ${dst_ip}
| | ...
-| | ${dscp}= | DSCP AF22
| | ${tx_if_name}= | Get Interface Name | ${node} | ${tx_if}
| | ${rx_if_name}= | Get Interface Name | ${node} | ${rx_if}
| | ${args}= | Traffic Script Gen Arg | ${rx_if_name} | ${tx_if_name}