diff options
Diffstat (limited to 'tests/vpp/device')
19 files changed, 271 insertions, 286 deletions
diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot index 56ce814b26..d7e3990e7f 100644 --- a/tests/vpp/device/__init__.robot +++ b/tests/vpp/device/__init__.robot @@ -39,8 +39,6 @@ | | ... | - dut_stats - Switch to enable DUT statistics | | ... | - vm_image - Guest VM disk image. | | ... | - packages_dir - Path to directory where VPP packages are stored. -| | ... | - vpp_rpm_pkgs - Package list for CentOS based system. -| | ... | - vpp_deb_pkgs - Package list for Debian based system. | | ... | | Set Global Variable | ${pkt_trace} | ${False} | | Set Global Variable | ${dut_stats} | ${True} diff --git a/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot index b504507a25..6d4cffd834 100644 --- a/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-eth-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot @@ -12,17 +12,16 @@ # limitations under the License. *** Settings *** +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/memif.robot | Resource | resources/libraries/robot/shared/testing_path.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BDMACLRN | BASE | ETH | MEMIF | DOCKER | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | container | ... | Documentation | *L2 bridge-domain test cases with memif interface* @@ -41,6 +40,8 @@ | ... | src-addr, dst-addr and MAC addresses.pecifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${nic_name}= | virtual # L2BD | ${bd_id1}= | 1 | ${bd_id2}= | 2 @@ -50,7 +51,6 @@ | ${container_engine}= | Docker | ${container_chain_topology}= | chain_functional -# TODO: Add update of VPP PIDs after container creation *** Test Cases *** | tc01-eth2p-ethip4-l2bdbase-eth-2memif-1dcr-device | | [Documentation] @@ -61,9 +61,12 @@ | | ... | two of its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} | | ... | ${sock_base} | dcr_uuid=${dcr_uuid} @@ -90,9 +93,12 @@ | | ... | two of its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} | | ... | ${sock_base} | dcr_uuid=${dcr_uuid} diff --git a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot index 1d1fb15722..12896b335e 100644 --- a/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-eth-l2xcbase-eth-2memif-1dcr-dev.robot @@ -12,17 +12,16 @@ # limitations under the License. *** Settings *** +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_xconnect.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/memif.robot | Resource | resources/libraries/robot/shared/testing_path.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2XCFWD | BASE | ETH | MEMIF | DOCKER | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | container | ... | Documentation | *L2 cross-connect test cases with memif interface* @@ -41,13 +40,14 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${nic_name}= | virtual # Memif | ${sock_base}= | memif-DUT1_CNF # Container | ${container_engine}= | Docker | ${container_chain_topology}= | chain_functional -# TODO: Add update of VPP PIDs after container creation *** Test Cases *** | tc01-eth2p-ethip4-l2xcbase-eth-2memif-1dcr-device | | [Documentation] @@ -58,9 +58,12 @@ | | ... | i/fs to be switched by DUT to and from docker; verify all packets \ | | ... | are received. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} | | ... | ${sock_base} | dcr_uuid=${dcr_uuid} @@ -79,9 +82,12 @@ | | ... | be switched by DUT to and from docker; verify all packets are\ | | ... | received. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | ${dut_node} | ${sock_base} | | ... | ${sock_base} | dcr_uuid=${dcr_uuid} diff --git a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot index 2db7a79030..a91810bed8 100644 --- a/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethip4-ip4base-eth-2memif-1dcr-dev.robot @@ -15,17 +15,16 @@ | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.IPUtil | ... -| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/memif.robot +| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | MEMIF | DOCKER | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | container | ... | Documentation | *IPv4 routing test cases with memif interface* @@ -45,6 +44,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${nic_name}= | virtual # IP | ${net1}= | 10.0.1.0 | ${net3}= | 10.0.3.0 @@ -62,7 +63,6 @@ | ${container_engine}= | Docker | ${container_chain_topology}= | chain_functional -# TODO: Add update of VPP PIDs after container creation *** Test Cases *** | tc01-eth2p-ethip4-ip4base-eth-2memif-1dcr-device | | [Documentation] @@ -72,9 +72,12 @@ | | ... | send ICMPv4 Echo Reqest form one TG interface to another one to be \ | | ... | switched by DUT1; verify header of received packet. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | | ... | ${dut_node} | ${sock_base} | ${sock_base} | dcr_uuid=${dcr_uuid} diff --git a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot index a6d3c8c8b8..122e83068f 100644 --- a/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot +++ b/tests/vpp/device/container_memif/eth2p-ethip6-ip6base-eth-2memif-1dcr-dev.robot @@ -16,15 +16,14 @@ | Library | resources.libraries.python.IPUtil | ... | Resource | resources/libraries/robot/shared/default.robot -| Resource | resources/libraries/robot/shared/memif.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP6FWD | BASE | ETH | MEMIF | DOCKER | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | container | ... | Documentation | *IPv4 routing test cases with memif interface* @@ -44,6 +43,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | memif_plugin.so +| ${nic_name}= | virtual # IP | ${net1}= | 2001:1::0 | ${net3}= | 2001:3::0 @@ -61,7 +62,6 @@ | ${container_engine}= | Docker | ${container_chain_topology}= | chain_functional -# TODO: Add update of VPP PIDs after container creation *** Test Cases *** | tc01-eth2p-ethip6-ip6base-eth-2memif-1dcr-device | | [Documentation] @@ -71,9 +71,12 @@ | | ... | send ICMPv6 Echo Reqest form one TG interface to another one to be \ | | ... | switched by DUT1; verify header of received packet. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Set up functional test with containers +| | And Start containers for device test | | And Configure interfaces in path up | | When Set up memif interfaces on DUT node | | ... | ${dut_node} | ${sock_base} | ${sock_base} | dcr_uuid=${dcr_uuid} diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot index 8eec787f84..b85bd70f96 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectnl-ip4base-dev.robot @@ -12,13 +12,13 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/crypto/ipsec.robot +| 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 | ... -| Test Setup | Set up IPSec SW device functional test | IPv4 -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... | Documentation | *IPv4 IPsec tunnel mode test suite.* @@ -33,6 +33,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${nic_name}= | virtual | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -50,30 +53,14 @@ | | ... | mode. | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv4 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${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-256-cbc-sha-256-128 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-256-128 in tunnel\ -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} @@ -83,37 +70,21 @@ | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} -| tc03-eth2p-ethip4ipsectnl-ip4base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip4ipsectnl-ip4base-device-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. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv4 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} -| | ... | ${dut_tun_ip} - -| tc04-eth2p-ethip4ipsectnl-ip4base-device-aes-256-cbc-sha-512-256 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-512-256 in tunnel\ -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_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 9b545933ed..f37630a0ce 100644 --- a/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip4ipsectpt-ip4base-dev.robot @@ -12,13 +12,13 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/crypto/ipsec.robot +| 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 | ... -| Test Setup | Set up IPSec SW device functional test | IPv4 -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... | Documentation | *IPv4 IPsec transport mode test suite.* @@ -33,6 +33,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${nic_name}= | virtual | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -50,28 +53,14 @@ | | ... | mode. | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv4 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} - -| tc02-eth2p-ethip4ipsectpt-ip4base-device-aes-256-cbc-sha-256-128 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-256-128 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet @@ -79,35 +68,21 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} -| tc03-eth2p-ethip4ipsectpt-ip4base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip4ipsectpt-ip4base-device-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. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv4 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} - -| tc04-eth2p-ethip4ipsectpt-ip4base-device-aes-256-cbc-sha-512-256 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-512-256 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | Then Send IPsec Packet and verify ESP encapsulation in received packet diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot index b0fd6c3823..5524b4fccc 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectnl-ip6base-dev.robot @@ -12,13 +12,13 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/crypto/ipsec.robot +| 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 | ... -| Test Setup | Set up IPSec SW device functional test | IPv6 -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... | Documentation | *IPv6 IPsec tunnel mode test suite.* @@ -33,6 +33,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${nic_name}= | virtual | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -51,30 +54,14 @@ | | ... | mode. | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv6 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${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-256-cbc-sha-256-128 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-256-128 in tunnel\ -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | is_ipv6=${TRUE} @@ -84,37 +71,21 @@ | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} -| tc03-eth2p-ethip6ipsectnl-ip6base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip6ipsectnl-ip6base-device-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. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv6 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} -| | ... | ${dut_tun_ip} - -| tc04-eth2p-ethip6ipsectnl-ip6base-device-aes-256-cbc-sha-512-256 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-512-256 in tunnel\ -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip} | | ... | ${dut_tun_ip} | ${tg_tun_ip} | is_ipv6=${TRUE} diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot index e65b89122d..a4623eda0d 100644 --- a/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot +++ b/tests/vpp/device/crypto/eth2p-ethip6ipsectpt-ip6base-dev.robot @@ -12,13 +12,13 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/crypto/ipsec.robot +| 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 | ... -| Test Setup | Set up IPSec SW device functional test | IPv6 -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | ... | Documentation | *IPv6 IPsec transport mode test suite.* @@ -33,6 +33,9 @@ | ... | *[Ref] Applicable standard specifications:* RFC4303. *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so | crypto_ia32_plugin.so +| ... | crypto_ipsecmb_plugin.so | crypto_openssl_plugin.so +| ${nic_name}= | virtual | ${tg_spi}= | ${1000} | ${dut_spi}= | ${1001} | ${ESP_PROTO}= | ${50} @@ -51,29 +54,14 @@ | | ... | mode. | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv6 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} - -| tc02-eth2p-ethip6ipsectpt-ip6base-device-aes-256-cbc-sha-256-128 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-256-128 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ... | is_ipv6=${TRUE} @@ -82,36 +70,21 @@ | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} -| tc03-eth2p-ethip6ipsectpt-ip6base-device-aes-128-cbc-sha-512-256 +| tc02-eth2p-ethip6ipsectpt-ip6base-device-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. | | ... +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure topology for IPv6 IPsec testing | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec -| | ... | ${dut_node} | ${dut_if} | ${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} -| | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi} -| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} - -| tc04-eth2p-ethip6ipsectpt-ip6base-device-aes-256-cbc-sha-512-256 -| | [Documentation] -| | ... | [Cfg] On DUT1 configure IPsec manual keyed connection with encryption\ -| | ... | algorithm AES-CBC-256 and integrity algorithm SHA-512-256 in transport -| | ... | mode. -| | ... | [Ver] Send and receive ESP packet between TG and VPP node. -| | ... -| | ${encr_alg}= | Crypto Alg AES CBC 256 -| | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} -| | When Configure manual keyed connection for IPSec +| | 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} | | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip} | | ... | is_ipv6=${TRUE} diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot index 0cd3dc82ec..6cf2b324d4 100644 --- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot @@ -27,9 +27,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BD | BASE | ETH | TAP | ... -| Test Setup | Run Keywords | Set up VPP device test -| ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | linux_bridge | ... | Documentation | *Tap Interface Traffic Tests* @@ -47,10 +46,11 @@ | ... | *[Ref] Applicable standard specifications:* *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${bid_from_TG}= | 19 | ${bid_to_TG}= | 20 | ${bid_TAP}= | tapBr - | ${tap_int1}= | tap0 | ${tap_int2}= | tap1 @@ -63,7 +63,10 @@ | | ... | [Ver] Packet sent from TG is passed through all L2BD and received\ | | ... | back on TG. Then src_ip, dst_ip and MAC are checked. | | ... -| | Given Configure path in 2-node circular topology | ${nodes['TG']} +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | ${nodes['TG']} | | ... | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} diff --git a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot index 24d0cdd44a..7568f03765 100644 --- a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot +++ b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot @@ -17,10 +17,10 @@ | Library | resources.libraries.python.Tap | Library | resources.libraries.python.Trace | ... +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot @@ -28,9 +28,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | TAP | ... -| Test Setup | Run Keywords | Set up VPP device test -| ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | namespace | Test Teardown | Tear down test | packet_trace | namespace | ... | Documentation | *Tap Interface Traffic Tests* @@ -48,13 +47,13 @@ | ... | *[Ref] Applicable standard specifications:* *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${tap1_VPP_ip}= | 16.0.10.1 | ${tap1_NM_ip}= | 16.0.10.2 | ${tap1_NM_mac}= | 02:00:00:00:00:02 | ${tap_int1}= | tap0 - | ${namespace1}= | nmspace1 - | ${dut_ip_address}= | 192.168.0.1 | ${tg_ip_address}= | 192.168.0.2 | ${tg_ip_address_GW}= | 192.168.0.0 @@ -68,7 +67,10 @@ | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\ | | ... | received on TG. | | ... -| | Given Configure path in 2-node circular topology | ${nodes['TG']} +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | ${nodes['TG']} | | ... | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | @@ -98,7 +100,10 @@ | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\ | | ... | received on TG. | | ... -| | Given Configure path in 2-node circular topology | ${nodes['TG']} +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | ${nodes['TG']} | | ... | ${nodes['DUT1']} | ${nodes['TG']} | | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot index 34429c61ff..dad29ff647 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot @@ -12,16 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/default.robot +| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | ... | Documentation | *IPv4 routing test cases* @@ -38,6 +38,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${tg_to_dut_if1_ip4}= | 10.10.10.2 | ${tg_to_dut_if2_ip4}= | 20.20.20.2 | ${dut_to_tg_if1_ip4}= | 10.10.10.1 @@ -54,7 +56,10 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -72,7 +77,10 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -90,7 +98,10 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -108,7 +119,10 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot index 1145ff9461..66a3a0f6da 100644 --- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot +++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-dev.robot @@ -12,16 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/shared/default.robot +| Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP6FWD | BASE | ETH | IP6BASE | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | ... | Documentation | *IPv6 routing test cases* @@ -38,6 +38,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${tg_to_dut_if1_ip6}= | 2001:1::2 | ${tg_to_dut_if2_ip6}= | 2001:2::2 | ${dut_to_tg_if1_ip6}= | 2001:1::1 @@ -54,12 +56,15 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv6 echo request packet and verify headers | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if1_mac} @@ -73,12 +78,15 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv6 echo request packet and verify headers | ${tg_node} | | ... | ${tg_to_dut_if1} | ${dut_node} | ${dut_to_tg_if2} | | ... | ${tg_to_dut_if1_ip6} | ${dut_to_tg_if2_ip6} | ${dut_to_tg_if1_mac} @@ -92,12 +100,15 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} | | And Suppress ICMPv6 router advertisement message | ${nodes} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv6 echo request packet and verify headers | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_node} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if1_ip6} | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_mac} @@ -111,7 +122,10 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv6 forwarding in circular topology | ${tg_to_dut_if1_ip6} | | ... | ${tg_to_dut_if2_ip6} | ${dut_to_tg_if1_ip6} | ${dut_to_tg_if2_ip6} @@ -119,7 +133,7 @@ | | ... | remote_host2_ip6=${remote_host2_ip6} | | ... | remote_host_ip6_prefix=${remote_host_ip6_prefix} | | And Suppress ICMPv6 router advertisement message | ${nodes} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send IPv6 echo request packet and verify headers | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_node} | ${tg_to_dut_if2} | | ... | ${remote_host1_ip6} | ${remote_host2_ip6} | ${dut_to_tg_if1_mac} diff --git a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot index 616f8c6503..47aae65d10 100644 --- a/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot +++ b/tests/vpp/device/l2bd/eth2p-eth-l2bdbasemaclrn-dev.robot @@ -13,17 +13,17 @@ *** Settings *** | Library | resources.libraries.python.L2Util +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot | Resource | resources/libraries/robot/l2/l2_traffic.robot -| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BDMACLRN | BASE | ETH | ICMP | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | ... | Documentation | *L2 bridge-domain test cases* @@ -42,6 +42,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${bd_id}= | 1 *** Test Cases *** @@ -54,7 +56,10 @@ | | ... | its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | And Create bridge domain | ${dut_node} | ${bd_id} @@ -62,7 +67,7 @@ | | ... | ${bd_id} | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... @@ -78,7 +83,10 @@ | | ... | its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | And Create bridge domain | ${dut_node} | ${bd_id} @@ -86,7 +94,7 @@ | | ... | ${bd_id} | | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | VPP get bridge domain data | ${nodes['DUT1']} | bd_id=${bd_id} diff --git a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot index ff1ef411fa..7053f7ae74 100644 --- a/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot +++ b/tests/vpp/device/l2xc/eth2p-ethicmp-l2xcbase-dev.robot @@ -20,8 +20,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2XCFWD | BASE | ETH | ICMP | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | ... | Documentation | *L2 cross-connect test cases* @@ -39,6 +39,10 @@ | ... | dst-addr and MAC addresses. | ... | *[Ref] Applicable standard specifications:* RFC792 +*** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual + *** Test Cases *** | tc01-eth2p-ethicmpv4-l2xcbase-device | | [Documentation] @@ -49,11 +53,14 @@ | | ... | its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} @@ -66,10 +73,13 @@ | | ... | its interfaces to be switched by DUT1; verify all packets are \ | | ... | received. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} -| | When All Vpp Interfaces Ready Wait | ${nodes} +| | And All Vpp Interfaces Ready Wait | ${nodes} | | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot index 9c9bd39de5..a1a19473b4 100644 --- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.VPPUtil | ... +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot @@ -30,8 +30,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | VHOST | 1VM | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | vhost | ... | Documentation | *IPv4 routing test cases with vhost user interface* @@ -50,6 +50,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${net1}= | 10.0.1.0 | ${net3}= | 10.0.3.0 | ${net1_ip1}= | 10.0.1.1 @@ -71,7 +73,10 @@ | | ... | the same network. There is created linux bridge on VM to pass packet \ | | ... | from one vhost-user interface to another one. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1} @@ -98,7 +103,7 @@ | | VPP Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | VPP Add IP Neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} -| | When Configure VM for vhost L2BD forwarding +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot index 3f71f831c4..f125bba035 100644 --- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.VPPUtil | ... +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot @@ -30,8 +30,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP6FWD | BASE | ETH | VHOST | 1VM | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | vhost | ... | Documentation | *IPv4 routing test cases with vhost user interface* @@ -50,6 +50,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${net1}= | 2001:1::0 | ${net3}= | 2001:3::0 | ${net1_ip1}= | 2001:1::1 @@ -71,7 +73,10 @@ | | ... | the same network. There is created linux bridge on VM to pass packet \ | | ... | from one vhost-user interface to another one. | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1} @@ -104,7 +109,7 @@ | | ... | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | VPP Add IP Neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} -| | When Configure VM for vhost L2BD forwarding +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot index 30ad621eba..2a821a72c7 100644 --- a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot @@ -20,8 +20,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BDMACLRN | BASE | ETH | VHOST | 1VM | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | vhost | ... | Documentation | *L2 bridge-domain test cases with vhost user interface* @@ -41,9 +41,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${bd_id1}= | 1 | ${bd_id2}= | 2 - | ${sock1}= | /tmp/sock1 | ${sock2}= | /tmp/sock2 @@ -57,10 +58,13 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on \ | | ... | receive. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} | | And Create bridge domain | ${dut_node} | ${bd_id1} @@ -87,10 +91,13 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on \ | | ... | receive. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} | | And Create bridge domain | ${dut_node} | ${bd_id1} diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot index b610a6cb29..a820bd2cbb 100644 --- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot @@ -24,8 +24,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2XCFWD | BASE | ETH | VHOST | 1VM | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | vhost | ... | Documentation | *L2 cross-connect test cases with vhost user interface* @@ -45,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${sock1}= | /tmp/sock1 | ${sock2}= | /tmp/sock2 @@ -58,10 +60,13 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets \ | | ... | are received. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | ${sock2} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} @@ -80,10 +85,13 @@ | | ... | be switched by DUT to and from VM; verify all packets are \ | | ... | received. [Ref] | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure interfaces in path up -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | ${sock2} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} |