From 7cb42e0a9f7785a7ffbc6076a1d5784b203cf9eb Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Sat, 30 Dec 2017 16:17:15 +0000 Subject: FIX: COP White List test cases Change-Id: I78f798da2e4dc7b4c8ee10b6f920687a279301b0 Signed-off-by: Peter Mikus --- ...x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot | 1 - ...e2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot index b7203795e2..023d739032 100644 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot +++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot @@ -431,7 +431,6 @@ | | ... | step 100kpps. | | [Tags] | 64B | 4T4C | MTHREAD | NDRDISC | | ${framesize}= | Set Variable | ${64} -| | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 | local | | ${min_rate}= | Set Variable | ${100000} | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} | | ${binary_min}= | Set Variable | ${min_rate} diff --git a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot index 90b5d9567a..f13b2b8d1d 100644 --- a/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot +++ b/tests/vpp/perf/ip6/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot @@ -67,7 +67,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -92,7 +92,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -116,7 +116,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -141,7 +141,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -166,7 +166,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -190,7 +190,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -215,7 +215,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -240,7 +240,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 @@ -264,7 +264,7 @@ | | When Initialize IPv6 forwarding in 3-node circular topology | | And Add Fib Table | ${dut1} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut1} | 2001:1:: | 64 | vrf=1 | local=${TRUE} -| | And Add Fib Table | ${dut2} | 1 +| | And Add Fib Table | ${dut2} | 1 | ipv6=${TRUE} | | And Vpp Route Add | ${dut2} | 2001:2:: | 64 | vrf=1 | local=${TRUE} | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 | | And COP Add whitelist Entry | ${dut2} | ${dut2_if2} | ip6 | 1 -- cgit 1.2.3-korg