X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fcrypto%2Fipsec.robot;h=8be8230c3dfc0abbfc3412c80994bbd0b52fb8d9;hb=b6606e7625e308a66bdfb9d5a9c065b58e429a99;hp=dc1265f43462080cc01d6c9893a9f0ee8b7101e5;hpb=f0e964d35af36f0923c6ae0421e74d94022cadba;p=csit.git

diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot
index dc1265f434..8be8230c3d 100644
--- a/resources/libraries/robot/crypto/ipsec.robot
+++ b/resources/libraries/robot/crypto/ipsec.robot
@@ -69,7 +69,7 @@
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | ${tg_if2_ip4} | ${TG_pf2_mac}[0]
 | | Vpp Route Add
 | | ... | ${dut1} | ${tg_host_ip4} | ${ip4_plen} | gateway=${tg_if1_ip4}
-| | ... | interface=${DUT1_${int}1}[0]
+| | ... | interface=${DUT1_${int}1}[0] | strict=${False}
 | | Set Test Variable | ${dut_tun_ip} | ${dut_if1_ip4}
 | | Set Test Variable | ${tg_tun_ip} | ${tg_if1_ip4}
 | | Set Test Variable | ${tg_src_ip} | ${tg_host_ip4}
@@ -153,17 +153,17 @@
 | | VPP IPsec Add SPD | ${node} | ${spd_id}
 | | VPP IPsec SPD Add If | ${node} | ${spd_id} | ${interface}
 | | ${action}= | Policy Action Bypass
-| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_hi} | ${action}
+| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | ${action}
 | | ... | inbound=${TRUE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6}
 | | ... | laddr_range=${tg_tun_ip} | raddr_range=${dut_tun_ip}
-| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_hi} | ${action}
+| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_hi} | ${action}
 | | ... | inbound=${FALSE} | proto=${ESP_PROTO} | is_ipv6=${is_ipv6}
 | | ... | laddr_range=${dut_tun_ip} | raddr_range=${tg_tun_ip}
 | | ${action}= | Policy Action Protect
-| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_lo} | ${action}
+| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | ${action}
 | | ... | sa_id=${r_sa_id} | laddr_range=${l_ip}
 | | ... | raddr_range=${r_ip} | inbound=${TRUE}
-| | VPP IPsec Policy Add | ${node} | ${spd_id} | ${p_lo} | ${action}
+| | VPP IPsec Add SPD Entry | ${node} | ${spd_id} | ${p_lo} | ${action}
 | | ... | sa_id=${l_sa_id} | laddr_range=${l_ip}
 | | ... | raddr_range=${r_ip} | inbound=${FALSE}
 
@@ -232,40 +232,21 @@
 | | | VPP Ipsec Set Async Mode | ${nodes['${dut}']}
 | | END
 
-| Disable Crypto Work of VPP Worker Threads on all VPP DUTs
+| Set Data Plane And Feature Plane Workers for IPsec on all VPP DUTs
 | | [Documentation]
 | | ... | Disable crypto work for specified data plane CPU cores
-| | ... | on all DUT nodes.
-| | ... | Currently only "port" (physical) interfaces are supported.
-| | ... | Will need a redesign if virtual interfaces (memif, vhost-user)
-| | ... | are present.
-| |
-| | ... | *Arguments:*
-| | ... | - dp_cores - Number of physical cores. Type: integer
-| |
-| | [Arguments] | ${dp_cores}
+| | ... | on all DUT nodes (leaving feature plane workers enabled).
+| | ... | Set Round Robin interface RX placement on data plane CPU cores
+| | ... | on all DUT nodes (leaving feature plane workers disabled).
 | |
 | | VPP Round Robin Rx Placement on all DUTs
-| | ... | ${nodes} | prefix=port | dp_core_limit=${dp_cores}
-| | FOR | ${dut} | IN | @{duts}
-| | | Disable Crypto Work of VPP Worker Threads on node
-| | | ... | ${dut} | ${dp_cores}
-| | END
+| | ... | ${nodes} | prefix=${EMPTY} | workers=${cpu_dp}
+| | VPP IPSec Crypto SW Scheduler Set Worker on all DUTs
+| | ... | ${nodes} | workers=${cpu_dp} | crypto_enable=${False}
 
-| Disable Crypto Work of VPP Worker Threads on node
+| Enable SPD flow cache IPv4 Outbound
 | | [Documentation]
-| | ... | Disable crypto work for specified data plane cores
-| | ... | on DUT node.
+| | ... | Enable IPv4 Outbound SPD flow cache in VPP configuration file.
 | |
-| | ... | *Arguments:*
-| | ... | - dut - DUT node. Type: string
-| | ... | - dp_cores - Number of physical cores. Type: integer
-| |
-| | [Arguments] | ${dut} | ${dp_cores}
-| |
-| | # Workers From Physical Cores keyword is currently defined in default.robot
-| | ${dp_worker_count} = | Workers From Physical Cores | ${dp_cores}
-| | FOR | ${worker_index} | IN RANGE | ${dp_worker_count}
-| | | VPP IPSec Crypto SW Scheduler Set Worker
-| | | ... | ${nodes['${dut}']} | ${worker_index} | crypto_enable=${False}
-| | END
+| | FOR | ${dut} | IN | @{duts}
+| | | Run Keyword | ${dut}.Add SPD Flow Cache IPv4 Outbound