From c5c36999b9e0ac27fd3200568cd76a69134cfd4e Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 16 Mar 2018 08:29:28 +0100 Subject: FIX: Crypto execution order Currently, VAT history looks like this: sw_interface_set_flags sw_if_index 2 admin-up sw_interface_set_flags sw_if_index 1 admin-up sw_interface_dump sw_interface_set_flags sw_if_index 2 admin-up sw_interface_set_flags sw_if_index 1 admin-up sw_interface_add_del_address sw_if_index 2 192.168.10.1/24 sw_interface_add_del_address sw_if_index 1 172.168.1.1/24 ip_neighbor_add_del sw_if_index 2 dst 192.168.10.2 mac 68:05:ca:3a:af:40 ip_neighbor_add_del sw_if_index 1 dst 172.168.1.2 mac 68:05:ca:35:78:e9 ip_add_del_route 10.0.0.0/8 via 192.168.10.2 sw_if_index 2 resolve-attempts 10 count 1 exec exec /tmp/ipsec_create_tunnel_dut1.config It should be like this: sw_interface_add_del_address sw_if_index 2 192.168.10.1/24 sw_interface_add_del_address sw_if_index 1 172.168.1.1/24 ip_neighbor_add_del sw_if_index 2 dst 192.168.10.2 mac 68:05:ca:3a:af:40 ip_neighbor_add_del sw_if_index 1 dst 172.168.1.2 mac 68:05:ca:35:78:e9 ip_add_del_route 10.0.0.0/8 via 192.168.10.2 sw_if_index 2 resolve-attempts 10 count 1 exec exec /tmp/ipsec_create_tunnel_dut1.config sw_interface_set_flags sw_if_index 2 admin-up sw_interface_set_flags sw_if_index 1 admin-up Change-Id: I4e943436dee00166966b4f53d9d0a40440bbf1e4 Signed-off-by: Peter Mikus --- ...-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot') diff --git a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 1b52ba250e..ff5bdab1ef 100644 --- a/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/vpp/perf/crypto/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -104,6 +104,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -138,6 +139,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find PDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -172,6 +174,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -205,6 +208,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find PDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -241,6 +245,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -276,6 +281,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find PDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -311,6 +317,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find NDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -345,6 +352,7 @@ | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${dut1_if2} | | ... | ${dut2_if1} | ${n_tunnels} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${laddr_ip4} | ${raddr_ip4} | ${addr_range} +| | And Set interfaces in path in 3-node circular topology up | | Then Find PDR using binary search and pps | ${framesize} | | ... | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} -- cgit 1.2.3-korg