diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/crypto/ipsec.robot | 7 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_setup.robot | 12 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 58 |
3 files changed, 57 insertions, 20 deletions
diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot index 80d2937e37..d918a54159 100644 --- a/resources/libraries/robot/crypto/ipsec.robot +++ b/resources/libraries/robot/crypto/ipsec.robot @@ -305,7 +305,12 @@ | | | Run keyword | ${dut}.Add Unix CLI Listen | /run/vpp/cli.sock | | | Run keyword | ${dut}.Add Unix Gid | | | Run keyword | ${dut}.Add Api Segment Gid -| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | ${1} +| | | ${socket_id}= | Set Variable | ${0} +| | | ${sw_dev_count}= | Set Variable | ${1} +| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_mb | ${socket_id} +| | | ... | ${sw_dev_count} +| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | aesni_gcm | ${socket_id} +| | | ... | ${sw_dev_count} | | Apply startup configuration on all VPP DUTs | restart_vpp=${FALSE} | | Set up functional test | | Run Keyword | Configure topology for ${ip_version} IPsec testing diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot index 492815b9b6..68f84b664f 100644 --- a/resources/libraries/robot/performance/performance_setup.robot +++ b/resources/libraries/robot/performance/performance_setup.robot @@ -355,18 +355,24 @@ | | ... | *Arguments:* | | ... | - topology_type - Topology type. Type: string | | ... | - nic_model - Interface model. Type: string +| | ... | - crypto_type - Crypto device type - HW_cryptodev or SW_cryptodev +| | ... | (Optional). Type: string, default value: HW_cryptodev | | ... | | ... | *Example:* | | ... | | ... | \| Set up IPSec performance test suite \| L2 \ | | ... | \| Intel-X520-DA2 \| | | ... -| | [Arguments] | ${topology_type} | ${nic_model} +| | [Arguments] | ${topology_type} | ${nic_model} | ${crypto_type}=HW_cryptodev | | ... | | Set up 3-node performance topology with DUT's NIC model | | ... | ${topology_type} | ${nic_model} -| | Configure crypto device on all DUTs | force_init=${True} -| | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| | ${numvfs}= | Set Variable If +| | ... | '${crypto_type}' == 'HW_cryptodev' | ${32} +| | ... | '${crypto_type}' == 'SW_cryptodev' | ${0} +| | Configure crypto device on all DUTs | force_init=${True} | numvfs=${numvfs} +| | Run Keyword If | '${crypto_type}' == 'HW_cryptodev' +| | ... | Configure kernel module on all DUTs | igb_uio | force_load=${True} | Set up performance topology with containers | | [Documentation] diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 74ad8d3f09..4761ea8481 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -73,28 +73,31 @@ | Configure crypto device on all DUTs | | [Documentation] | Verify if Crypto QAT device virtual functions are | | ... | initialized on all DUTs. If parameter force_init is set to True, then -| | ... | try to initialize. +| | ... | try to initialize/disable. | | ... | | ... | *Arguments:* -| | ... | - ${force_init} - Try to initialize. Type: boolean +| | ... | - force_init - Force to initialize. Type: boolean +| | ... | - numvfs - Number of VFs to initialize, 0 - disable the VFs +| | ... | (Optional). Type: integer, default value: ${32} | | ... | | ... | *Example:* | | ... | | ... | \| Configure crypto device on all DUTs \| ${True} \| | | ... -| | [Arguments] | ${force_init}=${False} +| | [Arguments] | ${force_init}=${False} | ${numvfs}=${32} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Crypto Device Verify | ${nodes['${dut}']} | force_init=${force_init} +| | | ... | numvfs=${numvfs} | Configure kernel module on all DUTs | | [Documentation] | Verify if specific kernel module is loaded on all DUTs. | | ... | If parameter force_load is set to True, then try to initialize. | | ... | | ... | *Arguments:* -| | ... | - ${module} - Module to verify. Type: string -| | ... | - ${force_load} - Try to load module. Type: boolean +| | ... | - module - Module to verify. Type: string +| | ... | - force_load - Try to load module. Type: boolean | | ... | | ... | *Example:* | | ... @@ -242,6 +245,23 @@ | | :FOR | ${dut} | IN | @{duts} | | | Run keyword | ${dut}.Add DPDK Dev Default TXD | ${txd} +| Add DPDK Uio Driver on all DUTs +| | [Documentation] | Add DPDK uio driver to VPP startup configuration on all +| | ... | DUTs. +| | ... +| | ... | *Arguments:* +| | ... | - uio_driver - Required uio driver. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Add DPDK Uio Driver on all DUTs \| igb_uio \| +| | ... +| | [Arguments] | ${uio_driver} +| | ... +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Run keyword | ${dut}.Add DPDK Uio Driver | ${uio_driver} + | Add NAT to all DUTs | | [Documentation] | Add NAT configuration to all DUTs. | | ... @@ -253,7 +273,7 @@ | | [Documentation] | Add Cryptodev to VPP startup configuration to all DUTs. | | ... | | ... | *Arguments:* -| | ... | - ${count} - Number of QAT devices. Type: integer +| | ... | - count - Number of QAT devices. Type: integer | | ... | | ... | *Example:* | | ... @@ -264,27 +284,33 @@ | | :FOR | ${dut} | IN | @{duts} | | | Run keyword | ${dut}.Add DPDK Cryptodev | ${count} -| Add crypto SW device on all DUTs -| | [Documentation] | Add required number of crypto SW devices to VPP startup -| | ... | configuration on all DUTs. +| Add DPDK SW cryptodev on DUTs in 3-node single-link circular topology +| | [Documentation] | Add required number of SW crypto devices of given type +| | ... | to VPP startup configuration on all DUTs in 3-node single-link +| | ... | circular topology. | | ... | | ... | *Arguments:* -| | ... | - ${count} - Number of SW crypto devices. Type: integer +| | ... | - sw_pmd_type - PMD type of SW crypto device. Type: string +| | ... | - count - Number of SW crypto devices. Type: string | | ... | | ... | *Example:* | | ... -| | ... | \| Add SW cryptodev on all DUTs \| ${4} \| +| | ... | \| Add DPDK SW cryptodev on DUTs in 3-node single-link circular\ +| | ... | topology \| aesni-mb \| ${2} \| | | ... -| | [Arguments] | ${count} -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Run keyword | ${dut}.Add DPDK SW Cryptodev | ${count} +| | [Arguments] | ${sw_pmd_type} | ${count} +| | ${socket_id}= | Get Interface Numa Node | ${nodes['DUT1']} | ${dut1_if2} +| | Run keyword | DUT1.Add DPDK SW Cryptodev | ${sw_pmd_type} | ${socket_id} +| | ... | ${count} +| | ${socket_id}= | Get Interface Numa Node | ${nodes['DUT2']} | ${dut2_if1} +| | Run keyword | DUT2.Add DPDK SW Cryptodev | ${sw_pmd_type} | ${socket_id} +| | ... | ${count} | Apply startup configuration on all VPP DUTs | | [Documentation] | Write startup configuration and restart VPP on all DUTs. | | ... | | ... | *Arguments:* -| | ... | - ${restart_vpp} - Whether to restart VPP (Optional). Type: boolean +| | ... | - restart_vpp - Whether to restart VPP (Optional). Type: boolean | | ... | | ... | *Example:* | | ... |