From 533fcfe3d177447aee7a3dca5f0d7a5f06d70377 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 25 Jun 2019 12:44:32 +0000 Subject: CSIT-1539 Aligning FUNC/PERF keywords - Phase III Change-Id: Ibd3e99390bf004173d3d126946b95ffe9ba8f196 Signed-off-by: Peter Mikus --- .../crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot | 29 ++++++++++------- .../crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot | 37 +++++++++++++--------- .../crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot | 31 +++++++++++------- .../crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot | 37 +++++++++++++--------- 4 files changed, 81 insertions(+), 53 deletions(-) (limited to 'tests/vpp/device/crypto') diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot index b85bd70f96..bf5db490b4 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot @@ -14,10 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | IP4FWD | IPSEC | IPSEC_TNL | IP4BASE +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | IP4FWD | IPSEC | IPSEC_TNL | IP4BASE | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -36,6 +36,7 @@ | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | virtual +| ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -46,14 +47,17 @@ | ${ip4_plen}= | ${24} *** Test Cases *** -| tc01-eth2p-ethip4ipsectnl-ip4base-device-aes-128-cbc-sha-256-128 +| tc01-eth2p-ethip4ipsectnl-ip4base-dev-aes-128-cbc-sha-256-128 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ | | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in tunnel\ | | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... +| | Set Test Variable | ${frame_size} | ${106} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv4 IPsec testing @@ -61,23 +65,26 @@ | | ${auth_alg}= | Integ Alg SHA 256 128 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} -| tc02-eth2p-ethip4ipsectnl-ip4base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip4ipsectnl-ip4base-dev-aes-128-cbc-sha-512-256 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ | | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in tunnel\ | | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... +| | Set Test Variable | ${frame_size} | ${106} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv4 IPsec testing @@ -85,11 +92,11 @@ | | ${auth_alg}= | Integ Alg SHA 512 256 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot index f37630a0ce..5cf0df6355 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot @@ -14,10 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | IP4FWD | IPSEC | IPSEC_TPT | IP4BASE +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | IP4FWD | IPSEC | IPSEC_TPT | IP4BASE | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -36,6 +36,7 @@ | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | virtual +| ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -46,14 +47,17 @@ | ${ip4_plen}= | ${24} *** Test Cases *** -| tc01-eth2p-ethip4ipsectpt-ip4base-device-aes-128-cbc-sha-256-128 +| tc01-eth2p-ethip4ipsectpt-ip4base-dev-aes-128-cbc-sha-256-128 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in\ +| | ... | transport mode. +| | ... +| | Set Test Variable | ${frame_size} | ${90} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv4 IPsec testing @@ -61,21 +65,24 @@ | | ${auth_alg}= | Integ Alg SHA 256 128 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} -| tc02-eth2p-ethip4ipsectpt-ip4base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip4ipsectpt-ip4base-dev-aes-128-cbc-sha-512-256 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in\ +| | ... | transport mode. +| | ... +| | Set Test Variable | ${frame_size} | ${90} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv4 IPsec testing @@ -83,9 +90,9 @@ | | ${auth_alg}= | Integ Alg SHA 512 256 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot index 5524b4fccc..b8c5ed5bb5 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2019 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -14,10 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | IP6FWD | IPSEC | IPSEC_TNL | IP6BASE +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | IP6FWD | IPSEC | IPSEC_TNL | IP6BASE | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -36,6 +36,7 @@ | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | virtual +| ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -47,14 +48,17 @@ | ${ip6_plen_rt}= | ${128} *** Test Cases *** -| tc01-eth2p-ethip6ipsectnl-ip6base-device-aes-128-cbc-sha-256-128 +| tc01-eth2p-ethip6ipsectnl-ip6base-dev-aes-128-cbc-sha-256-128 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ | | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in tunnel\ | | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... +| | Set Test Variable | ${frame_size} | ${158} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv6 IPsec testing @@ -62,23 +66,26 @@ | | ${auth_alg}= | Integ Alg SHA 256 128 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | is_ipv6=${TRUE} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} -| tc02-eth2p-ethip6ipsectnl-ip6base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip6ipsectnl-ip6base-dev-aes-128-cbc-sha-512-256 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ | | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in tunnel\ | | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... +| | Set Test Variable | ${frame_size} | ${158} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv6 IPsec testing @@ -86,11 +93,11 @@ | | ${auth_alg}= | Integ Alg SHA 512 256 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | is_ipv6=${TRUE} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot index a4623eda0d..dd5537016a 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot @@ -14,10 +14,10 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | ... -| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV -| ... | FUNCTEST | IP6FWD | IPSEC | IPSEC_TPT | IP6BASE +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY +| ... | NIC_Virtual | IP6FWD | IPSEC | IPSEC_TPT | IP6BASE | ... -| Suite Setup | Setup suite single link +| Suite Setup | Setup suite single link | scapy | Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... @@ -36,6 +36,7 @@ | @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so | ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so | ${nic_name}= | virtual +| ${overhead}= | ${58} | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -47,14 +48,17 @@ | ${ip6_plen_rt}= | ${128} *** Test Cases *** -| tc01-eth2p-ethip6ipsectpt-ip6base-device-aes-128-cbc-sha-256-128 +| tc01-eth2p-ethip6ipsectpt-ip6base-dev-aes-128-cbc-sha-256-128 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-256-128 in\ +| | ... | transport mode. +| | ... +| | Set Test Variable | ${frame_size} | ${174} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv6 IPsec testing @@ -62,22 +66,25 @@ | | ${auth_alg}= | Integ Alg SHA 256 128 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ... | is_ipv6=${TRUE} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} -| tc02-eth2p-ethip6ipsectpt-ip6base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip6ipsectpt-ip6base-dev-aes-128-cbc-sha-512-256 | | [Documentation] | | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. +| | ... | algorithm AES-CBC-128 and integrity algorithm SHA-512-256 in\ +| | ... | transport mode. +| | ... +| | Set Test Variable | ${frame_size} | ${174} +| | Set Test Variable | ${rxq_count_int} | ${1} | | ... | | Given Add PCI devices to all DUTs +| | And Set Max Rate And Jumbo And Handle Multi Seg | | And Apply startup configuration on all VPP DUTs | | And VPP Enable Traces On All Duts | ${nodes} | | When Configure topology for IPv6 IPsec testing @@ -85,10 +92,10 @@ | | ${auth_alg}= | Integ Alg SHA 512 256 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | And Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${encr_alg} | ${encr_key} | ${auth_alg} +| | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ... | is_ipv6=${TRUE} | | Then Send IPsec Packet and verify ESP encapsulation in received packet -| | ... | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} -- cgit 1.2.3-korg