From 7b73d46872db5adfc8f4603a9ca783be7d3fa323 Mon Sep 17 00:00:00 2001 From: premkumarv Date: Wed, 24 Jul 2019 08:43:23 -0400 Subject: CSIT-1471: Policer - VAT API to PAPI Change-Id: I6c7eff8d9cbb196ccb684a45579ac59942351cfe Signed-off-by: premkumarv --- .../device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot | 12 +++++++++--- .../ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot | 10 ++++++++-- .../device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot | 12 +++++++++--- .../ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot | 8 +++++++- .../ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot | 12 +++++++----- .../10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 3 ++- .../2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot | 12 +++++++++--- ...l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 3 ++- .../ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 12 +++++++----- .../2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 12 +++++++++--- 10 files changed, 69 insertions(+), 27 deletions(-) (limited to 'tests/vpp') diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot index 35026a19c8..ccdc74f06a 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot @@ -19,7 +19,7 @@ | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test -| Test Teardown | Tear down test | packet_trace +| Test Teardown | Tear down test | packet_trace | classify | ... | Test Template | Local Template | ... @@ -63,15 +63,21 @@ | | And Apply startup configuration on all VPP DUTs | with_trace=${True} | | When Initialize IPv4 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | ip4 | dst | 255.255.255.255 | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst +| | ... | 20.20.20.2 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx} | | Then Send packet and verify headers | | ... | ${tg} | 10.10.10.2 | 20.20.20.2 | | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +# TODO: Add check of number of hits of the classify session after traffic +# Until there is implemented check of number of hits of the classify session +# after passing the traffic log the show classify tables verbose to allow visual +# check of hit number when needed. +| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-64B-ethip4-ip4base-iacldstbase-dev diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot index 1b4b51d0f1..de479f8cfa 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot @@ -19,7 +19,7 @@ | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test -| Test Teardown | Tear down test | packet_trace +| Test Teardown | Tear down test | packet_trace | classify | ... | Test Template | Local Template | ... @@ -41,6 +41,7 @@ | ${overhead}= | ${0} | ${cir}= | ${100} | ${eir}= | ${150} +| ${dscp}= | AF22 *** Keywords *** | Local Template @@ -68,8 +69,13 @@ | | Then Send packet and verify marking | | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | 10.10.10.2 | 20.20.20.2 +# TODO: Add check of number of hits of the classify session after traffic +# Until there is implemented check of number of hits of the classify session +# after passing the traffic log the show classify tables verbose to allow visual +# check of hit number when needed. +| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-64B-ethip4-ip4base-ipolicemarkbase-dev | | [Tags] | 64B -| | frame_size=${64} | phy_cores=${0} \ No newline at end of file +| | frame_size=${64} | phy_cores=${0} diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot index 50ae50676f..e75f3ed572 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot @@ -19,7 +19,7 @@ | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test -| Test Teardown | Tear down test | packet_trace +| Test Teardown | Tear down test | packet_trace | classify | ... | Test Template | Local Template | ... @@ -63,15 +63,21 @@ | | And Apply startup configuration on all VPP DUTs | with_trace=${True} | | When Initialize IPv6 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst +| | ... | 2001:2::2 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx} | | Then Send packet and verify headers | | ... | ${tg} | 2001:1::2 | 2001:2::2 | | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac} +# TODO: Add check of number of hits of the classify session after traffic +# Until there is implemented check of number of hits of the classify session +# after passing the traffic log the show classify tables verbose to allow visual +# check of hit number when needed. +| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-78B-ethip6-ip6base-iacldstbase-dev diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot index e0ea687581..73abe62cb7 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot @@ -19,7 +19,7 @@ | ... | Suite Setup | Setup suite single link | scapy | Test Setup | Setup test -| Test Teardown | Tear down test | packet_trace +| Test Teardown | Tear down test | packet_trace | classify | ... | Test Template | Local Template | ... @@ -41,6 +41,7 @@ | ${overhead}= | ${0} | ${cir}= | ${100} | ${eir}= | ${150} +| ${dscp}= | AF22 *** Keywords *** | Local Template @@ -68,6 +69,11 @@ | | Then Send packet and verify marking | | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${tg_if1_mac} | ${dut1_if1_mac} | | ... | 2001:1::2 | 2001:2::2 +# TODO: Add check of number of hits of the classify session after traffic +# Until there is implemented check of number of hits of the classify session +# after passing the traffic log the show classify tables verbose to allow visual +# check of hit number when needed. +| | And Show Classify Tables Verbose | ${dut1} *** Test Cases *** | tc01-78B-ethip6-ip6base-ipolicemarkbase-dev diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot index 02ef9e2d20..27e6a9c55d 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot @@ -20,7 +20,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -76,15 +76,17 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize IPv4 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | ip4 | dst | 255.255.255.0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst +| | ... | 20.20.20.0 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx} | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut2} | ip4 | dst | 10.10.10.2 +| | ... | ${dut2} | ip4 | dst | 255.255.255.0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut2} | permit | ${table_idx} | ip4 | dst | 10.10.10.2 +| | ... | ${dut2} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst +| | ... | 10.10.10.0 | | And Vpp Enable Input Acl Interface | | ... | ${dut2} | ${dut2_if2} | ip4 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 0678175564..f5fbaa0a3a 100644 --- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -21,7 +21,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -53,6 +53,7 @@ | ${overhead}= | ${0} | ${cir}= | ${100} | ${eir}= | ${150} +| ${dscp}= | AF22 # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src253 diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot index 4888d02215..b1ce401f2a 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot @@ -20,7 +20,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -76,11 +76,17 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize IPv4 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | ip4 | dst | 255.255.255.0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip4 | dst | 20.20.20.2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst +| | ... | 20.20.20.0 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip4 | ${table_idx} +| | And Vpp Configures Classify Session L3 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip4 | dst +| | ... | 10.10.10.0 +| | And Vpp Enable Input Acl Interface +| | ... | ${dut1} | ${dut1_if2} | ip4 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot index 325d83da65..de42e17918 100644 --- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot +++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot @@ -20,7 +20,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -51,6 +51,7 @@ | ${overhead}= | ${0} | ${cir}= | ${100} | ${eir}= | ${150} +| ${dscp}= | AF22 # Traffic profile: | ${traffic_profile}= | trex-sl-2n-ethip4-ip4src253 diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot index 36d612c875..0a6239e799 100644 --- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot @@ -20,7 +20,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -76,15 +76,17 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize IPv6 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst +| | ... | 2001:2::0 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx} | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut2} | ip6 | dst | 2001:1::2 +| | ... | ${dut2} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut2} | permit | ${table_idx} | ip6 | dst | 2001:1::2 +| | ... | ${dut2} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst +| | ... | 2001:1::0 | | And Vpp Enable Input Acl Interface | | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot index 2bc668fcb2..8d9335e747 100644 --- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot +++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot @@ -20,7 +20,7 @@ | Suite Setup | Setup suite single link | performance | Suite Teardown | Tear down suite | performance | Test Setup | Setup test -| Test Teardown | Tear down test | performance +| Test Teardown | Tear down test | performance | classify | ... | Test Template | Local Template | ... @@ -76,11 +76,17 @@ | | And Apply startup configuration on all VPP DUTs | | When Initialize IPv6 forwarding in circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 -| | ... | ${dut1} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | ip6 | dst | ffff:ffff:ffff:ffff:ffff:ffff:ffff:0 | | And Vpp Configures Classify Session L3 -| | ... | ${dut1} | permit | ${table_idx} | ip6 | dst | 2001:2::2 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst +| | ... | 2001:2::0 | | And Vpp Enable Input Acl Interface | | ... | ${dut1} | ${dut1_if1} | ip6 | ${table_idx} +| | And Vpp Configures Classify Session L3 +| | ... | ${dut1} | permit | ${table_idx} | ${skip_n} | ${match_n} | ip6 | dst +| | ... | 2001:1::0 +| | And Vpp Enable Input Acl Interface +| | ... | ${dut1} | ${dut1_if2} | ip6 | ${table_idx} | | Then Find NDR and PDR intervals using optimized search *** Test Cases *** -- cgit 1.2.3-korg