diff options
249 files changed, 8535 insertions, 8288 deletions
diff --git a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot index 5bdf58cb61..00b40bed1e 100644 --- a/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot +++ b/dpdk-tests/perf/10ge2p1x520-eth-l2xcbase-testpmd-ndrpdrdisc.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.DPDK.DPDKTools | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA | ... | NIC_Intel-X520-DA2 | DPDK | ETH | L2XCFWD | BASE -| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | DPDK 3-node Performance Suite Teardown +| Suite Teardown | Tear down DPDK 3-node performance topology | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -64,7 +64,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -81,7 +81,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -99,7 +99,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -116,7 +116,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -134,7 +134,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -151,7 +151,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -169,7 +169,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -187,7 +187,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -205,7 +205,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -223,7 +223,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | 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,7 +241,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -259,7 +259,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -277,7 +277,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -295,7 +295,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -313,7 +313,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -331,7 +331,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -349,7 +349,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -367,7 +367,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot b/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot index cbfd5a81b6..5112c18344 100644 --- a/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot +++ b/dpdk-tests/perf/10ge2p1x520-ethip4-ip4base-l3fwd-ndrpdrdisc.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.DPDK.DPDKTools | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | 1NUMA | ... | NIC_Intel-X520-DA2 | DPDK | IP4FWD | BASE | ETH -| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | DPDK 3-node Performance Suite Teardown +| Suite Teardown | Tear down DPDK 3-node performance topology | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,7 +66,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -86,7 +86,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -107,7 +107,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -127,7 +127,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -148,7 +148,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -168,7 +168,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L3FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -189,7 +189,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -209,7 +209,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -230,7 +230,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -250,7 +250,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -271,7 +271,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -291,7 +291,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L3FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -312,7 +312,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -332,7 +332,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -353,7 +353,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -373,7 +373,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} @@ -394,7 +394,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} @@ -414,7 +414,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L3FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L3FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | ${min_rate} | ${max_rate} | | ... | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot index 861f75aa79..e39c9f59bf 100644 --- a/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot +++ b/dpdk-tests/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdrdisc.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.DPDK.DPDKTools | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA | ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE -| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X710 -| Suite Teardown | DPDK 3-node Performance Suite Teardown +| Suite Teardown | Tear down DPDK 3-node performance topology | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -67,7 +67,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -87,7 +87,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -108,7 +108,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -128,7 +128,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -149,7 +149,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -169,7 +169,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -190,7 +190,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -210,7 +210,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -231,7 +231,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -251,7 +251,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -272,7 +272,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -292,7 +292,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -313,7 +313,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -333,7 +333,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -354,7 +354,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -374,7 +374,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -395,7 +395,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -415,7 +415,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot b/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot index b07e4bb59b..cc1a2948c1 100644 --- a/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot +++ b/dpdk-tests/perf/40ge2p1xl710-eth-l2xcbase-testpmd-ndrpdrdisc.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.DPDK.DPDKTools | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDRDISC | 1NUMA | ... | NIC_Intel-XL710 | DPDK | ETH | L2XCFWD | BASE -| Suite Setup | DPDK 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up DPDK 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | DPDK 3-node Performance Suite Teardown +| Suite Teardown | Tear down DPDK 3-node performance topology | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -69,7 +69,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -89,7 +89,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -110,7 +110,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -130,7 +130,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -151,7 +151,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,7 +171,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '1' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '1' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -192,7 +192,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -212,7 +212,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -233,7 +233,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -253,7 +253,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'no' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -274,7 +274,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -294,7 +294,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '2' worker threads and rxqueues '1' with jumbo frames 'yes' +| | Given Start L2FWD '2' worker threads and '1' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -315,7 +315,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -335,7 +335,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -356,7 +356,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -376,7 +376,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'no' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'no' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -397,7 +397,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -417,7 +417,7 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Start L2FWD '4' worker threads and rxqueues '2' with jumbo frames 'yes' +| | Given Start L2FWD '4' worker threads and '2' rxqueues with jumbo frames 'yes' | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/resources/libraries/robot/DPDK/default.robot b/resources/libraries/robot/DPDK/default.robot index 070350a082..e6921c9b27 100644 --- a/resources/libraries/robot/DPDK/default.robot +++ b/resources/libraries/robot/DPDK/default.robot @@ -22,7 +22,7 @@ | Library | Collections *** Keywords *** -| Start L2FWD '${m}' worker threads and rxqueues '${n}' with jumbo frames '${b}' +| Start L2FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}' | | [Documentation] | Start the l2fwd with M worker threads without SMT | | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs. | | ... @@ -44,7 +44,7 @@ | | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues} | | ... | ${jumbo_frames} -| Start L2FWD '${m}' worker threads using SMT and rxqueues '${n}' with jumbo frames '${b}' +| Start L2FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}' | | [Documentation] | Start the l2fwd with M worker threads with SMT | | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs. | | ... @@ -67,8 +67,8 @@ | | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues} | | ... | ${jumbo_frames} -| Start L3FWD '${m}' worker threads and rxqueues '${n}' with jumbo frames '${b}' -| | [Documentation] | Start the l3fwd with M worker threads without SMT +| Start L3FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}' +| | [Documentation] | Start the l3fwd with M worker threads without SMT | | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs. | | ${cpu_cnt}= | Convert To Integer | ${m} | | ${nb_cores}= | Convert to String | ${m} @@ -87,8 +87,8 @@ | | Start the l3fwd test | ${nodes} | ${dut2} | ${dut2_if1} | ${dut2_if2} | | ... | ${nb_cores} | ${dut2_cpus} | ${rxqueues} | ${jumbo_frames} -| Start L3FWD '${m}' worker threads using SMT and rxqueues '${n}' with jumbo frames '${b}' -| | [Documentation] | Start the l3fwd with M worker threads with SMT +| Start L3FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}' +| | [Documentation] | Start the l3fwd with M worker threads with SMT | | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs. | | ${cpu_cnt}= | Convert To Integer | ${m} | | ${nb_cores_int}= | Evaluate | ${cpu_cnt}*2 diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot index 5707a82ade..22e46a02cb 100644 --- a/resources/libraries/robot/bridge_domain.robot +++ b/resources/libraries/robot/bridge_domain.robot @@ -20,7 +20,7 @@ | Resource | resources/libraries/robot/l2_traffic.robot *** Keywords *** -| Vpp l2bd forwarding setup +| Configure L2BD forwarding | | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning | | ... | is off set static L2FIB entry on second interface | | [Arguments] | ${node} | ${if1} | ${if2} | ${learn}=${TRUE} | ${mac}=${EMPTY} @@ -31,7 +31,7 @@ | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1} | | All Vpp Interfaces Ready Wait | ${nodes} -| Path for 3-node BD-SHG testing is set +| Configure path for 3-node BD-SHG test | | [Documentation] | Compute path for bridge domain split-horizon group testing | | ... | on three given nodes with following interconnections | | ... | TG - (2 links) - DUT1 - (1 link) - DUT2 - (2 links) - TG @@ -62,7 +62,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \ +| | ... | \| Given Configure path for 3-node BD-SHG test \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | | # Compute path TG - DUT1 with two links in between @@ -101,7 +101,7 @@ | | Set Test Variable | ${dut1_node} | | Set Test Variable | ${dut2_node} -| Interfaces in 3-node BD-SHG testing are up +| Set interfaces in 3-node BD-SHG test up | | [Documentation] | Set UP state on interfaces in 3-node path on nodes and | | ... | wait for all interfaces are ready. | | ... @@ -112,13 +112,13 @@ | | ... | - No value returned. | | ... | | ... | _NOTE:_ This KW uses test variables sets in -| | ... | "Path for 3-node BD-SHG testing is set" KW. +| | ... | "Configure path for 3-node BD-SHG test" KW. | | ... | | ... | *Example:* | | ... -| | ... | \| Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \ +| | ... | \| Configure path for 3-node BD-SHG test \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| -| | ... | \| Interfaces in 3-node BD-SHG testing are up \| +| | ... | \| Set interfaces in 3-node BD-SHG test up \| | | ... | | Set Interface State | ${tg_node} | ${tg_to_dut1_if1} | up | | Set Interface State | ${tg_node} | ${tg_to_dut1_if2} | up @@ -133,7 +133,7 @@ | | Vpp Node Interfaces Ready Wait | ${dut1_node} | | Vpp Node Interfaces Ready Wait | ${dut2_node} -| Bridge domain on DUT node is created +| Create bridge domain | | [Documentation] | Create bridge domain on given VPP node with defined | | ... | learning status. | | ... @@ -148,14 +148,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 2 \| -| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 5 \ +| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 2 \| +| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 5 \ | | ... | \| learn=${FALSE} \| | | [Arguments] | ${dut_node} | ${bd_id} | ${learn}=${TRUE} | | ${learn} = | Set Variable If | ${learn} == ${TRUE} | ${1} | ${0} | | Create L2 BD | ${dut_node} | ${bd_id} | learn=${learn} -| Interface is added to bridge domain +| Add interface to bridge domain | | [Documentation] | Set given interface admin state to up and add this | | ... | interface to required L2 bridge domain on defined | | ... | VPP node. @@ -171,13 +171,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface is added to bridge domain \| ${nodes['DUT2']} \ +| | ... | \| Add interface to bridge domain \| ${nodes['DUT2']} \ | | ... | \| GigabitEthernet0/8/0 \| 3 \| | | [Arguments] | ${dut_node} | ${dut_if} | ${bd_id} | ${shg}=0 | | Set Interface State | ${dut_node} | ${dut_if} | up | | Add Interface To L2 BD | ${dut_node} | ${dut_if} | ${bd_id} | ${shg} -| Destination port is added to L2FIB on DUT node +| Add destination port to L2FIB | | [Documentation] | Create a static L2FIB entry for required destination port | | ... | on defined interface and bridge domain ID | | ... | of the given VPP node. @@ -194,14 +194,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Destination port is added to L2FIB on DUT node \| ${nodes['TG']} \ +| | ... | \| Add destination port to L2FIB \| ${nodes['TG']} \ | | ... | \| eth1 \| ${nodes['DUT2']} \| GigabitEthernet0/8/0 \| 3 \| | | [Arguments] | ${dest_node} | ${dest_node_if} | ${vpp_node} | | ... | ${vpp_node_if} | ${bd_id} | | ${mac}= | Get Interface Mac | ${dest_node} | ${dest_node_if} | | Vpp Add L2fib Entry | ${vpp_node} | ${mac} | ${vpp_node_if} | ${bd_id} -| VM for Vhost L2BD forwarding is setup +| Configure VM for vhost L2BD forwarding | | [Documentation] | Setup QEMU and start VM with two vhost interfaces. | | ... | | ... | *Arguments:* @@ -216,9 +216,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT1']} \ +| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT1']} \ | | ... | \| /tmp/sock1 \| /tmp/sock2 \| -| | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT2']} \ +| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT2']} \ | | ... | \| /tmp/sock1 \| /tmp/sock2 \| qemu_instance_2 \| | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_name}=vm_node | | Run Keyword Unless | "${qemu_name}" == "vm_node" | Import Library @@ -246,7 +246,7 @@ | | Set Interface State | ${vm} | ${br} | up | if_type=name | | Set Test Variable | ${${qemu_name}} | ${vm} -| VPP Vhost interfaces for L2BD forwarding are setup +| Configure vhost interfaces for L2BD forwarding | | [Documentation] | Create two Vhost-User interfaces on defined VPP node. | | ... | | ... | *Arguments:* @@ -264,9 +264,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \ +| | ... | \| Configure vhost interfaces for L2BD forwarding \ | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| -| | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \ +| | ... | \| Configure vhost interfaces for L2BD forwarding \ | | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| dut2_vhost_if1 \ | | ... | \| dut2_vhost_if2 \| | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1 diff --git a/resources/libraries/robot/counters.robot b/resources/libraries/robot/counters.robot index 9c1339a833..3591dd5fe7 100644 --- a/resources/libraries/robot/counters.robot +++ b/resources/libraries/robot/counters.robot @@ -21,12 +21,12 @@ | | [Arguments] | ${nodes} | | Vpp Nodes Clear Interface Counters | ${nodes} -| Vpp dump stats +| Get interface statistics | | [Documentation] | Dump stats table on VPP node | | [Arguments] | ${node} | | Vpp Dump Stats Table | ${node} -| Vpp get interface ipv6 counter +| Get interface ipv6 counter | | [Documentation] | Return IPv6 statistics for node interface | | [Arguments] | ${node} | ${interface} | | ${ipv6_counter}= | Vpp Get Ipv6 Interface Counter | ${node} | ${interface} @@ -43,9 +43,9 @@ | | Sleep | 10 | Waiting for statistics to be collected | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Vpp show stats | ${nodes['${dut}']} +| | | Show vpp statistics | ${nodes['${dut}']} -| Vpp show stats +| Show vpp statistics | | [Documentation] | Show [error, hardware, interface] stats | | [Arguments] | ${node} | | Vpp Show Errors | ${node} @@ -58,7 +58,7 @@ | | Clear runtime counters on all DUTs | | Clear interface counters on all DUTs | | Clear hardware counters on all DUTs -| | Clear errors counters on all DUTs +| | Clear error counters on all DUTs | Clear runtime counters on all DUTs | | [Documentation] | Clear VPP runtime counters on all DUTs @@ -78,7 +78,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Vpp clear hardware counters | ${nodes['${dut}']} -| Clear errors counters on all DUTs +| Clear error counters on all DUTs | | [Documentation] | Clear VPP errors counters on all DUTs | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index fd1b280b94..c660736c97 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -26,17 +26,17 @@ | Library | Collections *** Keywords *** -| Setup all DUTs before test +| Configure all DUTs before test | | [Documentation] | Setup all DUTs in topology before test execution. | | ... | | Setup All DUTs | ${nodes} -| Setup all TGs before traffic script +| Configure all TGs for traffic script | | [Documentation] | Prepare all TGs before traffic scripts execution. | | ... | | All TGs Set Interface Default Driver | ${nodes} -| Show Vpp Version On All DUTs +| Show VPP version on all DUTs | | [Documentation] | Show VPP version verbose on all DUTs. | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -50,7 +50,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Vpp Show Errors | ${nodes['${dut}']} -| Show Vpp Trace Dump On All DUTs +| Show VPP trace dump on all DUTs | | [Documentation] | Save API trace and dump output on all DUTs. | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -58,7 +58,7 @@ | | | Vpp api trace save | ${nodes['${dut}']} | | | Vpp api trace dump | ${nodes['${dut}']} -| Show Vpp Vhost On All DUTs +| Show VPP vhost on all DUTs | | [Documentation] | Show Vhost User on all DUTs. | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -80,7 +80,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Set VPP Scheduling rr | ${nodes['${dut}']} -| Verify Crypto Device On All DUTs +| 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. @@ -90,7 +90,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Verify Crypto Device On All DUTs \| ${True} \| +| | ... | \| Configure crypto device on all DUTs \| ${True} \| | | ... | | [Arguments] | ${force_init}=${False} | | ... @@ -98,7 +98,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Crypto Device Verify | ${nodes['${dut}']} | force_init=${force_init} -| Verify Kernel Module On All DUTs +| 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. | | ... @@ -108,7 +108,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Verify Kernel Module On All DUTs \| ${True} \| +| | ... | \| Configure kernel module on all DUTs \| ${True} \| | | ... | | [Arguments] | ${module} | ${force_load}=${False} | | ... @@ -117,7 +117,7 @@ | | | Kernel Module Verify | ${nodes['${dut}']} | ${module} | | | ... | force_load=${force_load} -| Add '${m}' worker threads and rxqueues '${n}' in 3-node single-link topo +| Add '${m}' worker threads and '${n}' rxqueues in 3-node single-link circular topology | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\ | | ... | configuration on all DUTs in 3-node single-link topology. | | ... @@ -144,7 +144,7 @@ | | Add rxqueues config | ${dut1} | ${rxqueues} | | Add rxqueues config | ${dut2} | ${rxqueues} -| Add '${m}' worker threads and rxqueues '${n}' in 2-node single-link topo +| Add '${m}' worker threads and '${n}' rxqueues in 2-node single-link circular topology | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\ | | ... | configuration on all DUTs in 2-node single-link topology. | | ... @@ -161,7 +161,7 @@ | | Add CPU config | ${dut1} | ${dut1_cpu} | | Add rxqueues config | ${dut1} | ${rxqueues} -| Add '${m}' worker threads using SMT and rxqueues '${n}' in 3-node single-link topo +| Add '${m}' worker threads using SMT and '${n}' rxqueues in 3-node single-link circular topology | | [Documentation] | Setup M worker threads using SMT and N rxqueues in vpp\ | | ... | startup configuration on all DUTs in 3-node single-link topology. | | ... @@ -188,7 +188,7 @@ | | Add rxqueues config | ${dut1} | ${rxqueues} | | Add rxqueues config | ${dut2} | ${rxqueues} -| Add '${m}' worker threads using SMT and rxqueues '${n}' in 2-node single-link topo +| Add '${m}' worker threads using SMT and '${n}' rxqueues in 2-node single-link circular topology | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\ | | ... | configuration on all DUTs in 2-node single-link topology. | | ... @@ -249,7 +249,7 @@ | | ... | | Add PCI device | ${node} | ${pci_address} -| Add Heapsize Config to all DUTs +| Add heapsize config to all DUTs | | [Documentation] | Add Add Heapsize Config to VPP startup configuration\ | | ... | to all DUTs. | | ... @@ -258,7 +258,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Add Heapsize Config to all DUTs \| 200M \| +| | ... | \| Add heapsize config to all DUTs \| 200M \| | | ... | | [Arguments] | ${heapsize} | | ... @@ -266,7 +266,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Add Heapsize Config | ${nodes['${dut}']} | ${heapsize} -| Add No Multi Seg to all DUTs +| Add no multi seg to all DUTs | | [Documentation] | Add No Multi Seg to VPP startup configuration to all DUTs. | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -288,7 +288,7 @@ | | :FOR | ${dut} | IN | @{duts} | | | Add SNAT Config | ${nodes['${dut}']} -| Add Cryptodev to all DUTs +| Add cryptodev to all DUTs | | [Documentation] | AddCryptodev to VPP startup configuration to all | | ... | DUTs | | ... @@ -297,7 +297,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Add Cryptodev to all DUTs \| ${4} \| +| | ... | \| Add cryptodev to all DUTs \| ${4} \| | | ... | | [Arguments] | ${count} | | ${duts}= | Get Matches | ${nodes} | DUT* @@ -323,7 +323,7 @@ | | [Documentation] | Setup default startup configuration of VPP to all DUTs. | | ... | | Remove startup configuration of VPP from all DUTs -| | Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | Add all PCI devices to all DUTs | | Apply startup configuration on all VPP DUTs @@ -331,7 +331,7 @@ | | [Documentation] | Setup default startup configuration of VPP to all DUTs. | | ... | | Remove startup configuration of VPP from all DUTs -| | Add '1' worker threads and rxqueues '1' in 2-node single-link topo +| | Add '1' worker threads and '1' rxqueues in 2-node single-link circular topology | | Add all PCI devices to all DUTs | | Apply startup configuration on all VPP DUTs @@ -358,7 +358,7 @@ | | | ... | FAIL | More then one VPP PID found on node ${key}: ${pid} | | Set Test Variable | ${setup_vpp_pids} -| Check VPP PID in Teardown +| Verify VPP PID in Teardown | | [Documentation] | Check if the VPP PIDs on all DUTs are the same at the end\ | | ... | of test as they were at the begining. If they are not, only a message\ | | ... | is printed on console and to log. The test will not fail. @@ -373,19 +373,19 @@ | | Run Keyword And Return If | '${rc}'=='FAIL' | Log | ${err_msg} | | ... | console=yes | level=WARN -| Func Test Setup +| Set up functional test | | [Documentation] | Common test setup for functional tests. | | ... -| | Setup all DUTs before test +| | Configure all DUTs before test | | Save VPP PIDs -| | Setup all TGs before traffic script +| | Configure all TGs for traffic script | | Update All Interface Data On All Nodes | ${nodes} | | Reset VAT History On All DUTs | ${nodes} -| Func Test Teardown +| Tear down functional test | | [Documentation] | Common test teardown for functional tests. | | ... | | Show Packet Trace on All DUTs | ${nodes} | | Show VAT History On All DUTs | ${nodes} | | Vpp Show Errors On All DUTs | ${nodes} -| | Check VPP PID in Teardown +| | Verify VPP PID in Teardown diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot index 6c21fc8903..192ab2b729 100644 --- a/resources/libraries/robot/dhcp_client.robot +++ b/resources/libraries/robot/dhcp_client.robot @@ -19,7 +19,7 @@ | Documentation | DHCP Client specific keywords. *** Keywords *** -| Check DHCP DISCOVER header +| Verify DHCP DISCOVER header | | [Documentation] | Check if DHCP DISCOVER message contains all required | | ... | fields. | | ... @@ -36,9 +36,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \ +| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \ | | ... | \| eth2 \| 08:00:27:66:b8:57 \| -| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \ +| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \ | | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \| | | ... | | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY} @@ -50,7 +50,7 @@ | | ... | ${tg_node} | ${args} -| Check DHCP REQUEST after OFFER +| Verify DHCP REQUEST after OFFER | | [Documentation] | Check if DHCP REQUEST message contains all required | | ... | fields. DHCP REQUEST should be send by a client after DHCP OFFER | | ... | message sent by a server. @@ -80,12 +80,12 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Check DHCP REQUEST after OFFER \| ${nodes['TG']} \ +| | ... | \| Verify DHCP REQUEST after OFFER \| ${nodes['TG']} \ | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \ | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \| | | ... | | ... | \| Run Keyword And Expect Error \| DHCP REQUEST Rx timeout \ -| | ... | \| Check DHCP REQUEST after OFFER \ +| | ... | \| Verify DHCP REQUEST after OFFER \ | | ... | \| ${nodes['TG']} \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \ | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \ | | ... | \| offer_xid=11113333 \| @@ -106,7 +106,7 @@ | | ... | ${tg_node} | ${args} -| Send IP configuration to client via DHCP +| Configure IP on client via DHCP | | [Documentation] | Run script that sends IP configuration to the DHCP client. | | ... | | ... | *Arguments:* @@ -125,7 +125,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send IP configuration to client via DHCP \| ${nodes['TG']} \ +| | ... | \| Configure IP on client via DHCP \| ${nodes['TG']} \ | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \ | | ... | \| 192.168.23.10 \| 255.255.255.0 \| 86400 \| | | ... diff --git a/resources/libraries/robot/dhcp_proxy.robot b/resources/libraries/robot/dhcp_proxy.robot index b6948dc384..e2b16e5149 100644 --- a/resources/libraries/robot/dhcp_proxy.robot +++ b/resources/libraries/robot/dhcp_proxy.robot @@ -19,7 +19,7 @@ | Documentation | DHCP Proxy specific keywords. *** Keywords *** -| Send DHCP Messages +| Send DHCP messages and check answer | | [Documentation] | Send and receive DHCP messages between client | | ... | and server through DHCP proxy. | | ... @@ -38,7 +38,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send DHCP Messages \| ${nodes['TG']} \ +| | ... | \| Send DHCP messages and check answer \| ${nodes['TG']} \ | | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \ | | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \| | | ... @@ -57,7 +57,7 @@ | | Run Traffic Script On Node | dhcp/send_and_check_proxy_messages.py | | ... | ${tg_node} | ${args} -| Send DHCP DISCOVER +| Send DHCP DISCOVER and check answer | | [Documentation] | Send and receive DHCP DISCOVER. | | ... | | ... | *Arguments:* @@ -72,7 +72,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \ +| | ... | \| Send DHCP DISCOVER and check answer \| ${nodes['TG']} \ | | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \| | | ... | | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} @@ -86,7 +86,7 @@ | | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py | | ... | ${tg_node} | ${args} -| Send DHCP DISCOVER should fail +| DHCP DISCOVER should fail | | [Documentation] | Send and receive DHCP DISCOVER should fail. | | ... | | ... | *Arguments:* @@ -101,7 +101,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \ +| | ... | \| DHCP DISCOVER should fail \| ${nodes['TG']} \ | | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.1 \| | | ... | | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2} diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot index d8b32bd2fa..377e222804 100644 --- a/resources/libraries/robot/double_qemu_setup.robot +++ b/resources/libraries/robot/double_qemu_setup.robot @@ -14,7 +14,7 @@ | Library | resources.libraries.python.IPUtil *** Keywords *** -| Setup QEMU Vhost and Run +| Configure QEMU vhost and run it | | [Documentation] | Setup Qemu with 4 vhost-user interfaces and 4 namespaces. | | ... | Each call will be different object instance. | | ... @@ -72,7 +72,7 @@ | | ... | ${vm} | nmspace4 | ${vhost4} | ${ip4} | ${prefix_length} | | Set Test Variable | ${${qemu_name}} | ${vm} -| Qemu Teardown +| Tear down QEMU | | [Documentation] | Stop specific qemu instance | | ... | running on ${dut_node}, ${vm} is VM node info dictionary | | ... | returned by qemu_start or None. @@ -83,7 +83,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Qemu Teardown \| ${node['DUT1']} \| ${vm} \| qemu_node_1 \| +| | ... | \| Tear down QEMU \| ${node['DUT1']} \| ${vm} \| qemu_node_1 \| | | ... | | [Arguments] | ${dut_node} | ${vm} | ${qemu_name} | | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/gre.robot index 6ff0d989dd..c237e883a3 100644 --- a/resources/libraries/robot/gre.robot +++ b/resources/libraries/robot/gre.robot @@ -15,8 +15,8 @@ | Resource | resources/libraries/robot/interfaces.robot *** Keywords *** -| GRE tunnel interface is created and up -| | [Documentation] | Create GRE tunnel interface on defined VPP node and put \ +| Create GRE tunnel interface and set it up +| | [Documentation] | Create GRE tunnel interface and set it up on defined VPP node and put \ | | ... | the interface to UP state. | | ... | | ... | *Arguments:* @@ -33,11 +33,11 @@ | | ... | *Example:* | | ... | | ... | \| ${gre_name} \| ${gre_index}= \ -| | ... | \| GRE tunnel interface is created and up \| ${dut} \ +| | ... | \| Create GRE tunnel interface and set it up \| ${dut} \ | | ... | \| 192.0.1.1 \| 192.0.1.2 \| | | ... | | [Arguments] | ${dut_node} | ${source_ip_address} | ${destination_ip_address} -| | ${name} | ${index}= | Create GRE Tunnel Interface +| | ${name} | ${index}= | Create GRE tunnel interface | | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address} | | Set Interface State | ${dut_node} | ${index} | up | | [Return] | ${name} | ${index} diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot index e35cc92952..1d42cf186a 100644 --- a/resources/libraries/robot/honeycomb/access_control_lists.robot +++ b/resources/libraries/robot/honeycomb/access_control_lists.robot @@ -254,7 +254,7 @@ | | ... | Get classify session data | | ... | ${node} | ${table_index} | ${session_index} -| Interface ACL settings from Honeycomb should be +| Interface ACL configuration from Honeycomb should be | | [Documentation] | Retrieves ACL interface settings from Honeycomb\ | | ... | and compares with expected settings. | | ... @@ -265,7 +265,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface ACL settings from Honeycomb should be \ +| | ... | \| Interface ACL configuration from Honeycomb should be \ | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| table0 \| | | [Arguments] | ${node} | ${interface} | ${table_name} | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface} @@ -274,7 +274,7 @@ | | ... | ${data['vpp-interface-acl:acl']['ingress']['l2-acl']['classify-table']} | | ... | ${data['vpp-interface-acl:acl']['ingress']['ip4-acl']['classify-table']} -| Interface ACL settings from VAT should be +| Interface ACL configuration from VAT should be | | [Documentation] | Retrieves ACL interface settings from VAT\ | | ... | and compares with expected settings. | | ... @@ -285,14 +285,15 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface ACL settings from VAT should be \| ${nodes['DUT1']} \ -| | ... | \| GigabithEthernet0/8/0 \| ${0} \| +| | ... | \| Interface ACL configuration from VAT should be \ +| | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| ${0} \| +| | ... | | [Arguments] | ${node} | ${interface} | ${table_index} | | ${data}= | Get interface classify table | ${node} | ${interface} | | Should be equal | ${table_index} | ${data['l2_table_id']} | | Should be equal | ${table_index} | ${data['ip4_table_id']} -| Interface ACL settings from Honeycomb should be empty +| Interface ACL configuration from Honeycomb should be empty | | [Documentation] | Retrieves ACL interface settings from Honeycomb\ | | ... | and expects to fail. | | ... @@ -302,7 +303,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface ACL settings from Honeycomb should be empty \ +| | ... | \| Interface ACL configuration from Honeycomb should be empty \ | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface} @@ -310,7 +311,7 @@ | | ... | Set Variable | | ... | ${data['vpp-interface-acl:acl']['l2-acl']['classify-table']} -| Interface ACL settings from VAT should be empty +| Interface ACL configuration from VAT should be empty | | [Documentation] | Retrieves ACL interface settings from VAT\ | | ... | and expects to fail. | | ... @@ -320,7 +321,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface ACL settings from Honeycomb should be empty \ +| | ... | \| Interface ACL configuration from Honeycomb should be empty \ | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | ${data}= | Get interface classify table | ${node} | ${interface} @@ -379,7 +380,7 @@ | | Set ACL plugin interface | | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} | ${macip} -| Clear plugin-ACL settings +| Clear plugin-ACL configuration | | [Documentation] | Removes ACl assignment from interface, then deletes\ | | ... | IETF-ACL chain. | | ... @@ -389,7 +390,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Clear plugin-ACL settings | ${nodes['DUT1']} \ +| | ... | \| Clear plugin-ACL configuration | ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | Delete interface plugin ACLs | ${node} | ${interface} @@ -409,7 +410,7 @@ | | VPP log plugin acl settings | ${node} | | VPP log plugin acl interface assignment | ${node} -| Send ICMP packet with type and code +| Send ICMP packet with type and code and verify received packet | | [Documentation] | Sends an ICMP packet with specified code and type. | | ... | | ... | *Arguments:* @@ -429,7 +430,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send ICMP packet with type and code \| ${nodes['TG']} \ +| | ... | \| Send ICMP packet with type and code and verify received packet \| ${nodes['TG']} \ | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \ | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| ${1} \| ${1} \| | | ... diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index e868ecd50a..d14dd2d722 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -17,7 +17,7 @@ | Library | resources/libraries/python/honeycomb/HcPersistence.py *** Keywords *** -| Setup Honeycomb service on DUTs +| Configure Honeycomb service on DUTs | | [Documentation] | *Setup environment for honeycomb testing.* | | ... | | ... | _Setup steps:_ @@ -40,7 +40,7 @@ | | Wait until keyword succeeds | 4min | 16sec | | ... | Check honeycomb startup state | @{duts} -| Stop honeycomb service on DUTs +| Stop Honeycomb service on DUTs | | [Documentation] | *Cleanup environment after honeycomb testing.* | | ... | | ... | _Teardown steps:_ @@ -89,7 +89,7 @@ | | Stop Honeycomb service on DUTs | ${node} | | Clear persisted Honeycomb configuration | ${node} | | Setup DUT | ${node} -| | Setup Honeycomb service on DUTs | ${node} +| | Configure Honeycomb service on DUTs | ${node} | Restart Honeycomb and VPP | | [Documentation] | Restarts Honeycomb service and wait until it starts up. diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot index 3eef9f1b2d..95c6ece277 100644 --- a/resources/libraries/robot/honeycomb/interfaces.robot +++ b/resources/libraries/robot/honeycomb/interfaces.robot @@ -20,7 +20,7 @@ | Library | resources.libraries.python.TrafficScriptExecutor *** Keywords *** -| Honeycomb sets interface state +| Honeycomb configures interface state | | [Documentation] | Uses Honeycomb API to change the admin state\ | | ... | of the specified interface. | | ... @@ -31,7 +31,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb sets interface state \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb configures interface state \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| up \| | | [Arguments] | ${node} | ${interface} | ${state} | | interfaceAPI.Set interface state | ${node} | ${interface} | ${state} @@ -76,7 +76,7 @@ | | ... | ${vat_data['admin_up_down']} == 1 | up | down | | Should be equal | ${vat_state} | ${state} -| Honeycomb sets interface ipv4 address +| Honeycomb sets interface IPv4 address | | [Documentation] | Uses Honeycomb API to change ipv4 address\ | | ... | of the specified interface. Any existing addresses will be removed. | | ... @@ -88,13 +88,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb sets interface ipv4 address \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb sets interface IPv4 address \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 255.255.255.0 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${netmask} | | interfaceAPI.Add first ipv4 address | | ... | ${node} | ${interface} | ${address} | ${netmask} -| Honeycomb sets interface ipv4 address with prefix +| Honeycomb sets interface IPv4 address with prefix | | [Documentation] | Uses Honeycomb API to assign an ipv4 address to the\ | | ... | specified interface. Any existing addresses will be removed. | | ... @@ -106,13 +106,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb sets interface ipv4 address with prefix \ +| | ... | \| Honeycomb sets interface IPv4 address with prefix \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | interfaceAPI.Add first ipv4 address | | ... | ${node} | ${interface} | ${address} | ${prefix} -| Honeycomb adds interface ipv4 address +| Honeycomb adds interface IPv4 address | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\ | | ... | specified interface, without removing existing addresses. | | ... @@ -124,13 +124,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds interface ipv4 address \ +| | ... | \| Honeycomb adds interface IPv4 address \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | interfaceAPI.Add ipv4 address | | ... | ${node} | ${interface} | ${address} | ${prefix} -| Honeycomb fails to add interface ipv4 address +| Honeycomb fails to add interface IPv4 address | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\ | | ... | specified interface, and expects to fail with code 500. | | ... @@ -142,11 +142,11 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb fails to add interface ipv4 address \ +| | ... | \| Honeycomb fails to add interface IPv4 address \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | Run Keyword and Expect Error | *not successful. Status code: 500. -| | ... | Honeycomb adds interface ipv4 address +| | ... | Honeycomb adds interface IPv4 address | | ... | ${node} | ${interface} | ${address} | ${prefix} | IPv4 address from Honeycomb should be @@ -191,7 +191,7 @@ | | ... | ip=${address} | netmask=${netmask} | prefix_length=${prefix} | | Should contain | ${vpp_data} | ${settings} -| Honeycomb removes interface ipv4 addresses +| Honeycomb removes interface IPv4 addresses | | [Documentation] | Removes all configured ipv4 addresses from the specified\ | | ... | interface. | | ... @@ -201,7 +201,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb removes interface ipv4 addresses \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb removes interface IPv4 addresses \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | Remove all ipv4 addresses | ${node} | ${interface} @@ -240,7 +240,7 @@ | | ... | InterfaceCLI.VPP get interface ip addresses | | ... | ${node} | ${interface} | ipv4 -| Honeycomb adds interface ipv4 neighbor +| Honeycomb adds interface IPv4 neighbor | | [Documentation] | Uses Honeycomb API to assign an ipv4 neighbor to the\ | | ... | specified interface. | | ... @@ -252,7 +252,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds interface ipv4 neighbor \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb adds interface IPv4 neighbor \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \ | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac} | | interfaceAPI.Add ipv4 neighbor @@ -278,7 +278,7 @@ | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static | | Should contain | ${api_data['ietf-ip:ipv4']['neighbor']} | ${settings} -| Honeycomb clears all interface ipv4 neighbors +| Honeycomb clears all interface IPv4 neighbors | | [Documentation] | Uses Honeycomb API to remove all ipv4 neighbors from the\ | | ... | specified interface. | | ... @@ -288,7 +288,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb clears all interface ipv4 neighbors \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb clears all interface IPv4 neighbors \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | interfaceAPI.Remove all ipv4 neighbors | ${node} | ${interface} @@ -310,7 +310,7 @@ | | Run keyword and expect error | *KeyError:* | | ... | Set Variable | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']} -| Honeycomb sets interface ipv6 address +| Honeycomb sets interface IPv6 address | | [Documentation] | Uses Honeycomb API to change ipv6 address\ | | ... | of the specified interface. Existing IPv6 addresses will be removed,\ | | ... | with the exception of self-configured link-layer IPv6. @@ -323,13 +323,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb sets interface ipv6 address \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb sets interface IPv6 address \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | interfaceAPI.Add first ipv6 address | | ... | ${node} | ${interface} | ${address} | ${prefix} -| Honeycomb adds interface ipv6 address +| Honeycomb adds interface IPv6 address | | [Documentation] | Uses Honeycomb API to add an ipv6 address\ | | ... | to the specified interface. | | ... @@ -341,13 +341,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds interface ipv6 address \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb adds interface IPv6 address \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | interfaceAPI.Add ipv6 address | | ... | ${node} | ${interface} | ${address} | ${prefix} -| Honeycomb fails to add interface ipv6 address +| Honeycomb fails to add interface IPv6 address | | [Documentation] | Uses Honeycomb API to add an ipv6 address to the\ | | ... | specified interface, and expects to fail with code 500. | | ... @@ -359,11 +359,11 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb fails to add interface ipv6 address \ +| | ... | \| Honeycomb fails to add interface IPv6 address \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 10::10 \| 64 \| | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | | Run Keyword and Expect Error | *not successful. Status code: 500. -| | ... | Honeycomb adds interface ipv6 address +| | ... | Honeycomb adds interface IPv6 address | | ... | ${node} | ${interface} | ${address} | ${prefix} | IPv6 address from Honeycomb should contain @@ -407,7 +407,7 @@ | | ... | ip=${address} | prefix_length=${prefix} | | Should contain | ${vpp_data} | ${settings} -| Honeycomb removes interface ipv6 addresses +| Honeycomb removes interface IPv6 addresses | | [Documentation] | Removes all configured ipv6 addresses from the specified\ | | ... | interface. | | ... @@ -417,7 +417,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb removes interface ipv6 addresses \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb removes interface IPv6 addresses \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | Remove all ipv6 addresses | ${node} | ${interface} @@ -456,7 +456,7 @@ | | ... | InterfaceCLI.VPP get interface ip addresses | | ... | ${node} | ${interface} | ipv6 -| Honeycomb adds interface ipv6 neighbor +| Honeycomb adds interface IPv6 neighbor | | [Documentation] | Uses Honeycomb API to assign an ipv6 neighbor to the\ | | ... | specified interface. | | ... @@ -468,7 +468,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds interface ipv6 neighbor \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb adds interface IPv6 neighbor \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \| | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac} | | InterfaceAPI.Add ipv6 neighbor @@ -494,7 +494,7 @@ | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static | | Should contain | ${api_data['ietf-ip:ipv6']['neighbor']} | ${settings} -| Honeycomb clears all interface ipv6 neighbors +| Honeycomb clears all interface IPv6 neighbors | | [Documentation] | Uses Honeycomb API to remove all ipv6 neighbors from the\ | | ... | specified interface. | | ... @@ -504,7 +504,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb clears all interface ipv6 neighbors \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb clears all interface IPv6 neighbors \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} | | interfaceAPI.Remove all ipv6 neighbors | ${node} | ${interface} @@ -581,7 +581,7 @@ | | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface} | | Should be equal | ${vat_data['mtu']} | ${mtu} -| Honeycomb sets interface vrf ID +| Honeycomb sets interface VRF ID | | [Documentation] | Uses Honeycomb API to change interface vrf\ | | ... | configuration. | | ... @@ -592,13 +592,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb sets interface vrf ID \ +| | ... | \| Honeycomb sets interface VRF ID \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \| ipv4 \| | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version} | | interfaceAPI.Configure interface routing | | ... | ${node} | ${interface} | ${ip_version}-vrf-id | ${vrf_id} -| Interface vrf ID from Honeycomb should be +| Interface VRF ID from Honeycomb should be | | [Documentation] | Retrieves interface ethernet configuration\ | | ... | through Honeycomb and compares with settings supplied in arguments. | | ... @@ -610,7 +610,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface vrf ID from Honeycomb should be \ +| | ... | \| Interface VRF ID from Honeycomb should be \ | | ... | should be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \ | | ... | \| ipv4 \| | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version} @@ -618,7 +618,7 @@ | | Should be equal | | ... | ${api_data['v3po:routing']['${ip_version}-vrf-id']} | ${vrf_id} -| Interface vrf ID from VAT should be +| Interface VRF ID from VAT should be | | [Documentation] | Retrieves interface ethernet configuration\ | | ... | through VAT and compares with settings supplied in arguments. | | ... @@ -629,7 +629,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Interface vrf ID from VAT should be \ +| | ... | \| Interface VRF ID from VAT should be \ | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \| | | [Arguments] | ${node} | ${interface} | ${vrf_id} | | ${vat_data}= | InterfaceCLI.get interface vrf table @@ -692,7 +692,7 @@ | | Should be equal as strings | | ... | ${api_data['if-index']} | ${sw_if_index} -| Get Interface index from oper data +| Get interface index from oper data | | [Documentation] | Retrieves interface operational data and returns\ | | ... | if-index of the specified interface. | | ... @@ -702,7 +702,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Get Interface index from oper data \| ${nodes['DUT1']} \| local0 \| +| | ... | \| Get interface index from oper data \| ${nodes['DUT1']} \| local0 \| | | [Arguments] | ${node} | ${interface} | | ${data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} | | Return from keyword | ${data['if-index']} diff --git a/resources/libraries/robot/honeycomb/lisp.robot b/resources/libraries/robot/honeycomb/lisp.robot index 0ee1314f71..cda8d827ba 100644 --- a/resources/libraries/robot/honeycomb/lisp.robot +++ b/resources/libraries/robot/honeycomb/lisp.robot @@ -17,7 +17,7 @@ | Documentation | Keywords used to test Honeycomb Lisp features. *** Keywords *** -| Honeycomb enables Lisp +| Honeycomb enables LISP | | [Documentation] | Uses Honeycomb API to enable Lisp. | | ... | | ... | *Arguments:* @@ -25,13 +25,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \| +| | ... | \| Honeycomb enables LISP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... | | Set Lisp state | ${node} | ${TRUE} -| Honeycomb disables Lisp +| Honeycomb disables LISP | | [Documentation] | Uses Honeycomb API to disable Lisp. | | ... | | ... | *Arguments:* @@ -39,7 +39,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb disables Lisp \| ${nodes['DUT1']} \| +| | ... | \| Honeycomb disables LISP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... @@ -55,8 +55,8 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \| GigabitEthernet0/8/0\ -| | ... | \| loc_01 \| +| | ... | \| Honeycomb adds locator set \| ${nodes['DUT1']} \ +| | ... | \| GigabitEthernet0/8/0 \| loc_01 \| | | ... | | [Arguments] | ${node} | ${interface} | ${locator_set} | | ... @@ -77,7 +77,7 @@ | | ... | | Configure Lisp Mapping | ${node} | ${data} -| Honeycomb removes all Lisp mappings +| Honeycomb removes all LISP mappings | | [Documentation] | Uses Honeycomb API to clear the eid-table. | | ... | | ... | *Arguments:* @@ -85,13 +85,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb removes all Lisp mappings \| ${nodes['DUT1']} \| +| | ... | \| Honeycomb removes all LISP mappings \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... | | Configure lisp mapping | ${node} | ${NONE} -| Lisp should not be configured +| LISP should not be configured | | [Documentation] | Retrieves Lisp configuration from Honeycomb operational\ | | ... | data, and expects an empty dictionary. | | ... @@ -100,14 +100,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp should not be configured \| ${nodes['DUT1']} \| +| | ... | \| LISP should not be configured \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... | | Run keyword and Expect Error | KeyError: 'lisp-feature-data' | | ... | Get Lisp operational data | ${node} -| Lisp state From Honeycomb Should Be +| LISP state from Honeycomb should be | | [Documentation] | Retrieves Lisp state from Honeycomb operational\ | | ... | data, and compares Lisp state with expected value. | | ... @@ -117,7 +117,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp state From Honeycomb Should Be \| ${nodes['DUT1']} \ +| | ... | \| LISP state from Honeycomb should be \| ${nodes['DUT1']} \ | | ... | \| enabled \| | | ... | | [Arguments] | ${node} | ${state} @@ -130,7 +130,7 @@ | | ... | Should be equal as strings | | ... | ${data['lisp-state']['enable']} | ${False} -| Lisp state From VAT Should Be +| LISP state from VAT should be | | [Documentation] | Retrieves Lisp state from VAT,\ | | ... | and compares Lisp state with expected value. | | ... @@ -140,14 +140,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp state From VAT Should Be \| ${nodes['DUT1']} \| enabled \| +| | ... | \| LISP state from VAT should be \| ${nodes['DUT1']} \| enabled \| | | ... | | [Arguments] | ${node} | ${state} | | ... | | ${status}= | VPP show Lisp State | ${node} | | Should match | ${status['feature_status']} | ${state} -| Lisp mapping From Honeycomb Should Be +| LISP mapping from Honeycomb should be | | [Documentation] | Retrieves Lisp mapping from Honeycomb operational\ | | ... | data, and compares with expected data. | | ... @@ -157,7 +157,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp mapping From Honeycomb Should Be \| ${nodes['DUT1']} \ +| | ... | \| LISP mapping from Honeycomb should be \| ${nodes['DUT1']} \ | | ... | \| ${settings} \| | | ... | | [Arguments] | ${node} | ${settings} @@ -167,7 +167,7 @@ | | ${data}= | Set Variable | ${data['eid-table']['vni-table'][0]} | | Compare data structures | ${data} | ${settings} -| Lisp mapping From VAT Should Be +| LISP mapping from VAT should be | | [Documentation] | Retrieves Lisp mapping from VAT,\ | | ... | and compares with expected data. | | ... @@ -177,7 +177,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp mapping From VAT Should Be \| ${nodes['DUT1']} \ +| | ... | \| LISP mapping from VAT should be \| ${nodes['DUT1']} \ | | ... | \| ${settings} \| | | ... | | [Arguments] | ${node} | ${settings} @@ -185,7 +185,7 @@ | | ${data}= | VPP show Lisp eid table | ${node} | | Compare data structures | ${data[0]} | ${settings} -| Lisp mappings from Honeycomb should not exist +| LISP mappings from Honeycomb should not exist | | [Documentation] | Retrieves Lisp mappings from operational\ | | ... | data, and expects to find none. | | ... @@ -194,7 +194,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp mappings from Honeycomb should not exist \ +| | ... | \| LISP mappings from Honeycomb should not exist \ | | ... | \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} @@ -203,7 +203,7 @@ | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']} | | Should be empty | ${data['eid-table']['vni-table']} -| Lisp mappings from VAT should not exist +| LISP mappings from VAT should not exist | | [Documentation] | Retrieves Lisp mappings from VAT,\ | | ... | and expects to receive an empty list. | | ... @@ -212,7 +212,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Lisp mappings from VAT should not exist \| ${nodes['DUT1']} \| +| | ... | \| LISP mappings from VAT should not exist \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... @@ -246,7 +246,7 @@ | | ... | ${loc_data['locator-set'][0]['interface'][0]['interface-ref']} | | ... | ${interface} -| Honeycomb adds Lisp adjacency +| Honeycomb adds LISP adjacency | | [Documentation] | Uses Honeycomb API to configure Lisp adjacency. | | ... | | ... | *Arguments:* @@ -258,7 +258,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds Lisp adjacency \| ${nodes['DUT1']} \| ${1} \| map1\ +| | ... | \| Honeycomb adds LISP adjacency \| ${nodes['DUT1']} \| ${1} \| map1\ | | ... | \| adj1 \| ${data} \| | | ... | | [Arguments] | ${node} | ${vni} | ${map} | ${adjacency} | ${data} @@ -266,7 +266,7 @@ | | Add Lisp adjacency | | ... | ${node} | ${vni} | ${map} | ${adjacency} | ${data} -| Honeycomb adds Lisp Map resolver +| Honeycomb adds LISP map resolver | | [Documentation] | Uses Honeycomb API to configure Lisp map resolver. | | ... | | ... | *Arguments:* @@ -275,7 +275,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb adds Lisp Map resolver \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb adds LISP map resolver \| ${nodes['DUT1']} \ | | ... | \| 192.168.0.2 \| | | ... | | [Arguments] | ${node} | ${ip_address} @@ -467,7 +467,7 @@ | | ${data}= | Vpp show Lisp Map Request Mode | ${node} | | Should be equal | ${data['map_request_mode']} | ${destination} -| Honeycomb enables Lisp PITR feature +| Honeycomb enables LISP PITR feature | | [Documentation] | Uses Honeycomb API to configure Lisp PITR feature. | | ... | | ... | *Arguments:* @@ -476,13 +476,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb enables Lisp PITR feature \| ${nodes['DUT1']} \| loc1 \| +| | ... | \| Honeycomb enables LISP PITR feature \| ${nodes['DUT1']} \| loc1 \| | | ... | | [Arguments] | ${node} | ${locator_set} | | ... | | Configure PITR | ${node} | ${locator_set} -| Honeycomb enables Lisp PETR feature +| Honeycomb enables LISP PETR feature | | [Documentation] | Uses Honeycomb API to configure Lisp PETR feature. | | ... | | ... | *Arguments:* @@ -491,14 +491,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb enables Lisp PETR feature \| ${nodes['DUT1']}\ +| | ... | \| Honeycomb enables LISP PETR feature \| ${nodes['DUT1']}\ | | ... | \| 192.168.0.1 \| | | ... | | [Arguments] | ${node} | ${ip_address} | | ... | | Configure PETR | ${node} | ${ip_address} -| Honeycomb enables Lisp RLOC feature +| Honeycomb enables LISP RLOC feature | | [Documentation] | Uses Honeycomb API to enable the Lisp RLOC feature. | | ... | | ... | *Arguments:* @@ -506,7 +506,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb enables Lisp RLOC feature\ +| | ... | \| Honeycomb enables LISP RLOC feature\ | | ... | \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} @@ -652,7 +652,7 @@ | | Should be equal | ${data['status']} | enabled | | Should be equal | ${data['locator_set']} | ${locator_set} -| Honeycomb disables all Lisp features +| Honeycomb disables all LISP features | | [Documentation] | Uses Honeycomb API to remove all Lisp configuration. | | ... | | ... | *Arguments:* @@ -660,7 +660,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb disables all Lisp features \| ${nodes['DUT1']} \| +| | ... | \| Honeycomb disables all LISP features \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | ... diff --git a/resources/libraries/robot/honeycomb/netconf.robot b/resources/libraries/robot/honeycomb/netconf.robot index 75eaefbf25..1fd287dcd4 100644 --- a/resources/libraries/robot/honeycomb/netconf.robot +++ b/resources/libraries/robot/honeycomb/netconf.robot @@ -17,7 +17,7 @@ | Documentation | Keywords for managing Netconf communication. *** Keywords *** -| Netconf session is established +| Netconf session should be established | | [Documentation] | Open a communication channel on the Netconf session\ | | ... | and exchange hello messages. | | ... @@ -26,7 +26,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Netconf session is established \| ${nodes['DUT1']} \| +| | ... | \| Netconf session should be established \| ${nodes['DUT1']} \| | | [Arguments] | ${node} | | Create session | ${node} | ${hello} diff --git a/resources/libraries/robot/honeycomb/notifications.robot b/resources/libraries/robot/honeycomb/notifications.robot index 125e06c7a1..f46f7eec66 100644 --- a/resources/libraries/robot/honeycomb/notifications.robot +++ b/resources/libraries/robot/honeycomb/notifications.robot @@ -18,7 +18,7 @@ | Documentation | Keywords used to test Honeycomb notifications over Netconf. *** Keywords *** -| Notification listener is established +| Notification listener should be established | | [Documentation] | Connects to Honeycomb notification service. | | ... | | ... | *Arguments:* @@ -26,7 +26,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Notification listener is established \| ${nodes['DUT1']} \| +| | ... | \| Notification listener should be established \| ${nodes['DUT1']} \| | | [Arguments] | ${node} | | Create session | ${node} | ${hello} | | Add notification listener | ${subscription} diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot index 2744ba6377..69f5f92d0d 100644 --- a/resources/libraries/robot/honeycomb/persistence.robot +++ b/resources/libraries/robot/honeycomb/persistence.robot @@ -26,7 +26,7 @@ | Documentation | Keywords used to test Honeycomb persistence. *** Keywords *** -| Honeycomb is restarted +| Restart Honeycomb | | [Documentation] | Restarts Honeycomb without clearing persistence data. | | ... | | ... | *Arguments:* @@ -34,14 +34,14 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb is restarted \| ${nodes['DUT1']} \| +| | ... | \| Restart Honeycomb \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | Stop Honeycomb service on DUTs | ${node} | | Log Persisted Configuration | ${node} -| | Setup Honeycomb service on DUTs | ${node} +| | Configure Honeycomb service on DUTs | ${node} -| VPP is restarted +| Restart VPP | | [Documentation] | Restarts VPP and waits until it reconnects with Honeycomb. | | ... | | ... | *Arguments:* @@ -49,7 +49,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VPP is restarted \| ${nodes['DUT1']} \| +| | ... | \| Restart VPP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | Setup DUT | ${node} @@ -70,7 +70,7 @@ | | Wait until keyword succeeds | 2min | 20sec | | ... | Check Honeycomb startup state | ${node} -| Honeycomb and VPP are restarted +| Restart Honeycomb and VPP | | [Documentation] | Stops Honeycomb, restarts VPP and then starts Honeycomb\ | | ... | again. | | ... @@ -79,13 +79,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb and VPP are restarted \| ${nodes['DUT1']} \| +| | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} | | Stop Honeycomb service on DUTs | ${node} | | Log Persisted Configuration | ${node} | | Setup DUT | ${node} -| | Setup Honeycomb service on DUTs | ${node} +| | Configure Honeycomb service on DUTs | ${node} | Multi-Feature Persistence Test Configuration | | [Documentation] | Uses Honeycomb to set basic settings for VxLAN,\ @@ -111,7 +111,7 @@ | | ... | ${node} | ${vhost_interface} | ${vhost_user_client} | | Honeycomb creates sub-interface | ${node} | ${interface} | | ... | ${sub_if_1_match} | ${sub_if_1_tags} | ${sub_if_1_settings} -| | Honeycomb sets interface state | ${node} | ${interface} | up +| | Honeycomb configures interface state | ${node} | ${interface} | up | | Honeycomb sets the sub-interface up | | ... | ${node} | ${interface} | ${sub_if_id} | | Honeycomb adds sub-interface to bridge domain @@ -214,7 +214,7 @@ | | Stop Honeycomb service on DUTs | ${node} | | Modify persistence files | ${node} | { | abc | | Setup DUT | ${node} -| | Setup Honeycomb service on DUTs | ${node} +| | Configure Honeycomb service on DUTs | ${node} | Log persisted configuration on node | | [Documentation] | Logs the content of Honeycomb's persitence files. @@ -243,14 +243,14 @@ | | [Arguments] | ${node} | | Honeycomb and VPP should have default configuration | ${node} | | Import Variables | resources/test_data/honeycomb/interface_ip.py -| | Honeycomb sets interface state | ${node} | ${interface} | up -| | Honeycomb sets interface ipv4 address with prefix +| | Honeycomb configures interface state | ${node} | ${interface} | up +| | Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} -| | Honeycomb adds interface ipv4 neighbor +| | Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} -| | Honeycomb sets interface ipv6 address +| | Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} -| | Honeycomb adds interface ipv6 neighbor +| | Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} | Interface Persistence Check diff --git a/resources/libraries/robot/honeycomb/policer.robot b/resources/libraries/robot/honeycomb/policer.robot index 965b0f3cb5..4319b27a21 100644 --- a/resources/libraries/robot/honeycomb/policer.robot +++ b/resources/libraries/robot/honeycomb/policer.robot @@ -85,7 +85,7 @@ | | [Arguments] | ${node} | | Configure Policer | ${node} | ${policer_data['name']} -| Policer test teardown +| Tear down policer test | | [Documentation] | Uses Honeycomb API to remove Policer configuration\ | | ... | and reset interface state. | | ... @@ -133,7 +133,7 @@ | | Disable Policer on interface | | ... | ${node} | ${interface} -| Honeycomb Send Packet and Verify Marking +| Honeycomb Send packet and verify marking | | [Documentation] | Send packet and verify DSCP of the received packet. | | ... | | ... | *Arguments:* @@ -149,7 +149,7 @@ | | ... | *Example:* | | ... | | ... | \| ${dscp}= \| DSCP AF22 \| -| | ... | \| Send Packet and Verify Marking \| ${nodes['TG']} \| eth1 \| eth2 \ +| | ... | \| Send packet and verify marking \| ${nodes['TG']} \| eth1 \| eth2 \ | | ... | \| 08:00:27:87:4d:f7 \| 52:54:00:d4:d8:22 \| 192.168.122.2 \ | | ... | \| 192.168.122.1 \| ${dscp} \| | | ... diff --git a/resources/libraries/robot/honeycomb/port_mirroring.robot b/resources/libraries/robot/honeycomb/port_mirroring.robot index 532b5157d8..63fbcea7a0 100644 --- a/resources/libraries/robot/honeycomb/port_mirroring.robot +++ b/resources/libraries/robot/honeycomb/port_mirroring.robot @@ -21,7 +21,7 @@ | Library | resources.libraries.python.Trace *** Keywords *** -| Honeycomb Configures SPAN on interface +| Honeycomb configures SPAN on interface | | [Documentation] | Uses Honeycomb API to configure SPAN on the specified\ | | ... | interface, mirroring one or more interfaces. | | ... @@ -33,7 +33,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb Configures SPAN on interface \| ${nodes['DUT1']} \ +| | ... | \| Honeycomb configures SPAN on interface \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| [{'iface-ref': 'GigabitEthernet0/10/0', \ | | ... | \| 'state': 'transmit'}, \ | | ... | \| {'iface-ref': 'local0', 'state': 'both'}] \| diff --git a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot index dc15742b5b..7385f1c15f 100644 --- a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot +++ b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot @@ -16,7 +16,7 @@ | ... | WITH NAME | IfAPI *** Keywords *** -| Honeycomb Creates PBB Sub Interface +| Honeycomb creates PBB sub-interface | | [Documentation] | Uses Honeycomb API to set PBB sub-interface on an\ | | ... | interface. | | ... @@ -37,7 +37,7 @@ | | IfAPI.Create PBB Sub Interface | | ... | ${node} | ${super_if} | ${params} -| Honeycomb Removes PBB Sub Interface +| Honeycomb removes PBB sub-interface | | [Documentation] | Uses Honeycomb API to remove PBB sub-interface from its\ | | ... | super interface. | | ... @@ -94,7 +94,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | | Should be empty | ${data} -| Honeycomb Fails to Create PBB Sub Interface +| Honeycomb fails to create PBB sub-interface | | [Documentation] | Uses Honeycomb API to set PBB sub-interface with wrong\ | | ... | parameter(s) and expects to fail. | | ... diff --git a/resources/libraries/robot/honeycomb/proxyarp.robot b/resources/libraries/robot/honeycomb/proxyarp.robot index 209e213cf8..2df1d3c13a 100644 --- a/resources/libraries/robot/honeycomb/proxyarp.robot +++ b/resources/libraries/robot/honeycomb/proxyarp.robot @@ -149,7 +149,7 @@ | | Variable Should Not Exist | | ... | ${oper_data['ietf-ip:ipv6']['nd-proxy:nd-proxies']['nd-proxy']} -| Verify IPv6ND Proxy +| Verify IPv6ND proxy | | [Documentation] | Send and receive ICMPv6 messages between TG interfaces | | ... | through Neighbor Discovery proxy. | | ... @@ -171,7 +171,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Verify IPv6ND Proxy \| ${nodes['TG']} \ +| | ... | \| Verify IPv6ND proxy \| ${nodes['TG']} \ | | ... | \| eth3 \| eth4 \| 3ffe:62::1 \| 3ffe:63::2 \ | | ... | \| 08:00:27:cc:4f:54 \| 08:00:27:64:18:d2 \ | | ... | \| 08:00:27:c9:6a:d5 \| 08:00:27:c4:75:3a \| diff --git a/resources/libraries/robot/honeycomb/routing.robot b/resources/libraries/robot/honeycomb/routing.robot index 7e38ef1e52..752b4fe29e 100644 --- a/resources/libraries/robot/honeycomb/routing.robot +++ b/resources/libraries/robot/honeycomb/routing.robot @@ -83,7 +83,7 @@ | | [Arguments] | ${node} | ${name} | | Delete routing table | ${node} | ${name} -| Verify Route IPv4 +| Verify route IPv4 | | [Documentation] | Send an ICMP packet from one TG interface and receive\ | | ... | it on the other TG interface. | | ... @@ -102,7 +102,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Verify Route IPv4 \| ${nodes['TG']} \ +| | ... | \| Verify route IPv4 \| ${nodes['TG']} \ | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth1 \| 08:00:27:cc:4f:54 \ | | ... | \| eth2 \| 08:00:27:c9:6a:d5 \| | | ... @@ -118,7 +118,7 @@ | | ... | --rx_if | ${rx_port_name} | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} -| Verify Route IPv6 +| Verify route IPv6 | | [Documentation] | Send an ICMPv6 packet from one TG interface and receive\ | | ... | it on the other TG interface. | | ... @@ -137,7 +137,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Verify Route IPv6 \| ${nodes['TG']} \ +| | ... | \| Verify route IPv6 \| ${nodes['TG']} \ | | ... | \| 10::1 \| 11::1 \| eth2 \| 08:00:27:cc:4f:54 \ | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| | | ... diff --git a/resources/libraries/robot/honeycomb/slaac.robot b/resources/libraries/robot/honeycomb/slaac.robot index 10e4887dca..966f95fa42 100644 --- a/resources/libraries/robot/honeycomb/slaac.robot +++ b/resources/libraries/robot/honeycomb/slaac.robot @@ -17,7 +17,7 @@ | Documentation | Keywords used to test SLAAC using Honeycomb. *** Keywords *** -| Honeycomb Configures SLAAC +| Honeycomb configures SLAAC | | [Documentation] | Uses Honeycomb API to configure SLAAC on the specified\ | | ... | interface. | | ... @@ -28,7 +28,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Honeycomb Configures SLAAC \| ${node} \| ${interface} \ +| | ... | \| Honeycomb configures SLAAC \| ${node} \| ${interface} \ | | ... | \| ${slaac_data} \| | | ... | | [Arguments] | ${node} | ${interface} | ${slaac_data} @@ -103,4 +103,4 @@ | | [Arguments] | ${node} | ${interface} | | Honeycomb removes SLAAC configuration | ${node} | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | down -| | Honeycomb removes interface ipv6 addresses | ${node} | ${interface} +| | Honeycomb removes interface IPv6 addresses | ${node} | ${interface} diff --git a/resources/libraries/robot/interfaces.robot b/resources/libraries/robot/interfaces.robot index 60e1480633..1161e85174 100644 --- a/resources/libraries/robot/interfaces.robot +++ b/resources/libraries/robot/interfaces.robot @@ -16,12 +16,12 @@ | Resource | resources/libraries/robot/vat/interfaces.robot *** Keywords *** -| VPP reports interfaces on | [Arguments] | ${node} +| Report VPP interfaces | [Arguments] | ${node} | | VPP reports interfaces through VAT on | ${node} #| | VPP reports interfaces through ODL on | ${node} #| | VPP reports interfaces through DEBUGCLI on | ${node} -| Setup MTU on TG based on MTU on DUT +| Configure MTU on TG based on MTU on DUT | | [Documentation] | Type of the tg_node must be TG and dut_node must be DUT | | [Arguments] | ${tg_node} | ${dut_node} | | Append Nodes | ${tg_node} | ${dut_node} diff --git a/resources/libraries/robot/ipsec.robot b/resources/libraries/robot/ipsec.robot index 9c9980341f..7b8fab5b66 100644 --- a/resources/libraries/robot/ipsec.robot +++ b/resources/libraries/robot/ipsec.robot @@ -27,7 +27,7 @@ | Documentation | *IPsec keywords.* *** Keywords *** -| IPsec Generate Keys +| Generate keys for IPSec | | [Documentation] | Generate keys for IPsec. | | ... | | ... | *Arguments:* @@ -41,7 +41,7 @@ | | ... | *Example:* | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \| | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \| -| | ... | \| IPsec Generate Keys \| ${encr_alg} \| ${auth_alg} \| +| | ... | \| Generate keys for IPSec \| ${encr_alg} \| ${auth_alg} \| | | [Arguments] | ${crypto_alg} | ${integ_alg} | | ${encr_key_len}= | Get Crypto Alg Key Len | ${crypto_alg} | | ${encr_key}= | Generate Random String | ${encr_key_len} @@ -50,7 +50,7 @@ | | Set Test Variable | ${encr_key} | | Set Test Variable | ${auth_key} -| Setup Path for IPsec testing +| Configure path for IPSec test | | [Documentation] | Setup path for IPsec testing TG<-->DUT1. | | ... | | ... | _NOTE:_ This KW sets following test case variable: @@ -63,7 +63,7 @@ | | ... | - dut_lo - DUT loopback interface. Type: string | | ... | | ... | *Example:* -| | ... | \| Setup Path for IPsec testing \| +| | ... | \| Configure path for IPSec test \| | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${tg_if} | ${tg_node}= | Next Interface @@ -82,7 +82,7 @@ | | Set Test Variable | ${dut_if_mac} | | Set Test Variable | ${dut_lo} -| Setup Topology for IPv4 IPsec testing +| Configure topology for IPv4 IPsec testing | | [Documentation] | Setup topology for IPv4 IPsec testing. | | ... | | ... | _NOTE:_ This KW sets following test case variable: @@ -92,8 +92,8 @@ | | ... | - tg_src_ip - TG source IP address. Type: string | | ... | | ... | *Example:* -| | ... | \| Setup Topology for IPv4 IPsec testing \| -| | Setup Path for IPsec testing +| | ... | \| Configure topology for IPv4 IPsec testing \| +| | Configure path for IPSec test | | Set Interface Address | ${dut_node} | ${dut_if} | ${dut_if_ip4} | | ... | ${ip4_plen} | | Set Interface Address | ${dut_node} | ${dut_lo} | ${dut_lo_ip4} @@ -106,7 +106,7 @@ | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip4} | | Set Test Variable | ${tg_src_ip} | ${tg_lo_ip4} -| Setup Topology for IPv6 IPsec testing +| Configure topology for IPv6 IPsec testing | | [Documentation] | Setup topology fo IPv6 IPsec testing. | | ... | | ... | _NOTE:_ This KW sets following test case variable: @@ -116,8 +116,8 @@ | | ... | - tg_src_ip - TG source IP address. Type: string | | ... | | ... | *Example:* -| | ... | \| Setup Topology for IPv6 IPsec testing \| -| | Setup Path for IPsec testing +| | ... | \| Configure topology for IPv6 IPsec testing \| +| | Configure path for IPSec test | | VPP Set If IPv6 Addr | ${dut_node} | ${dut_if} | ${dut_if_ip6} | ${ip6_plen} | | VPP Set If IPv6 Addr | ${dut_node} | ${dut_lo} | ${dut_lo_ip6} | ${ip6_plen} | | Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip6} | ${tg_if_mac} @@ -129,7 +129,7 @@ | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip6} | | Set Test Variable | ${tg_src_ip} | ${tg_lo_ip6} -| VPP Setup IPsec Manual Keyed Connection +| Configure manual keyed connection for IPSec | | [Documentation] | Setup IPsec manual keyed connection on VPP node. | | ... | | ... | *Arguments:* @@ -153,7 +153,7 @@ | | ... | *Example:* | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \| | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \| -| | ... | \| VPP Setup IPsec Manual Keyed Connection \| ${nodes['DUT1']} \ +| | ... | \| Configure manual keyed connection for IPSec \| ${nodes['DUT1']} \ | | ... | \| GigabitEthernet0/8/0 \| ${encr_alg} \| sixteenbytes_key \ | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1000} \| ${1001} \ | | ... | \| 192.168.4.4 \| 192.168.3.3 \| 192.168.100.3 \| 192.168.100.2 \| @@ -186,7 +186,7 @@ | | ... | sa_id=${l_sa_id} | laddr_range=${l_ip} | | ... | raddr_range=${r_ip} | inbound=${FALSE} -| VPP Update IPsec SA Keys +| Update IPSec SA keys | | [Documentation] | Update IPsec SA keys on VPP node. | | ... | | ... | *Arguments:* @@ -197,7 +197,7 @@ | | ... | - integ_key - Integrity key. Type: string | | ... | | ... | *Example:* -| | ... | \| VPP Update IPsec SA Keys \| ${nodes['DUT1']} \ +| | ... | \| Update IPSec SA keys \| ${nodes['DUT1']} \ | | ... | \| 10 \| 20 \| sixteenbytes_key \| twentybytessecretkey \| | | [Arguments] | ${node} | ${l_sa_id} | ${r_sa_id} | ${crypto_key} | | ... | ${integ_key} @@ -206,7 +206,7 @@ | | VPP IPsec SA Set Key | ${dut_node} | ${r_sa_id} | ${crypto_key} | | ... | ${integ_key} -| Send and Receive IPsec Packet +| Send IPsec Packet and verify ESP encapsulation in received packet | | [Documentation] | Send IPsec packet from TG to DUT. Receive IPsec packet\ | | ... | from DUT on TG and verify ESP encapsulation. | | ... @@ -228,7 +228,7 @@ | | ... | *Example:* | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \| | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \| -| | ... | \| Send and Receive IPsec Packet \| ${nodes['TG']} \| eth1 \ +| | ... | \| Send IPsec Packet and verify ESP encapsulation in received packet \| ${nodes['TG']} \| eth1 \ | | ... | \| 52:54:00:d4:d8:22 \| ${encr_alg} \| sixteenbytes_key \ | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1001} \| ${1000} \ | | ... | \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \| 192.168.100.3 \| diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot index d279892ec3..d200afdea2 100644 --- a/resources/libraries/robot/ipv4.robot +++ b/resources/libraries/robot/ipv4.robot @@ -23,14 +23,14 @@ *** Keywords *** -| Setup IPv4 adresses on all DUT nodes in topology +| Configure IPv4 addresses on all DUTs | | [Documentation] | Setup IPv4 address on all DUTs in topology | | [Arguments] | ${nodes} | ${nodes_addr} | | ${interfaces}= | VPP nodes set ipv4 addresses | ${nodes} | ${nodes_addr} | | :FOR | ${interface} | IN | @{interfaces} | | | Set Interface State | @{interface} | up | if_type=name -| Routes are set up for IPv4 testing +| Configure routes for IPv4 test | | [Documentation] | Setup routing on all VPP nodes required for IPv4 tests | | [Arguments] | ${nodes} | ${nodes_addr} | | Append Nodes | ${nodes['DUT1']} | ${nodes['DUT2']} @@ -51,16 +51,16 @@ | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr} | | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} | ${dut1_if} -| Setup DUT nodes for IPv4 testing -| | Setup IPv4 adresses on all DUT nodes in topology | ${nodes} | ${nodes_ipv4_addr} +| Configure DUT nodes for IPv4 testing +| | Configure IPv4 addresses on all DUTs | ${nodes} | ${nodes_ipv4_addr} | | Setup ARP on all DUTs | ${nodes} | ${nodes_ipv4_addr} -| | Routes are set up for IPv4 testing | ${nodes} | ${nodes_ipv4_addr} +| | Configure routes for IPv4 test | ${nodes} | ${nodes_ipv4_addr} | | All Vpp Interfaces Ready Wait | ${nodes} | TG interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 | | Node "${nodes['TG']}" interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4 -| Node "${from_node}" interface "${from_port}" can route to node "${to_node}" interface "${to_port}" ${hops} hops away using IPv4 +| Route traffic from interface '${from_port}' on node '${from_node}' to interface '${to_port}' on node '${to_node}' '${hops}' hops away using IPv4 | | ${src_ip}= | Get IPv4 address of node "${from_node}" interface "${from_port}" from "${nodes_ipv4_addr}" | | ${dst_ip}= | Get IPv4 address of node "${to_node}" interface "${to_port}" from "${nodes_ipv4_addr}" | | ${src_mac}= | Get interface mac | ${from_node} | ${from_port} @@ -76,7 +76,7 @@ | | | ... | --is_dst_tg ${is_dst_tg} | | Run Traffic Script On Node | ipv4_ping_ttl_check.py | ${from_node} | ${args} -| Ipv4 icmp echo sweep +| Execute IPv4 ICMP echo sweep | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size} | ${step} | | Append Nodes | ${src_node} | ${dst_node} @@ -95,7 +95,7 @@ | | Run Traffic Script On Node | ipv4_sweep_ping.py | ${src_node} | ${args} | | ... | timeout=${180} -| Send ARP request and validate response +| Send ARP request and verify response | | [Arguments] | ${tg_node} | ${vpp_node} | | ${link_name}= | Get first active connecting link between node "${tg_node}" and "${vpp_node}" | | ${src_if}= | Get interface by link name | ${tg_node} | ${link_name} @@ -109,7 +109,7 @@ | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args} -| IP addresses are set on interfaces +| Configure IP addresses on interfaces | | [Documentation] | Iterates through @{args} list and Set Interface Address | | ... | for every (${dut_node}, ${interface}, ${address}, | | ... | ${prefix}) tuple. @@ -123,7 +123,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| IP addresses are set on interfaces \ +| | ... | \| Configure IP addresses on interfaces \ | | ... | \| ${dut1_node} \| ${dut1_to_dut2} \| 192.168.1.1 \| 24 \| | | ... | \| ... \| ${dut1_node} \| ${dut1_to_tg} \| 192.168.2.1 \| 24 \| | | ... @@ -132,7 +132,7 @@ | | | Set Interface Address | ${dut_node} | ${interface} | ${address} | | | ... | ${prefix} -| Node replies to ICMP echo request +| Send ICMP echo request and verify answer | | [Documentation] | Run traffic script that waits for ICMP reply and ignores | | ... | all other packets. | | ... @@ -148,7 +148,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Node replies to ICMP echo request \ +| | ... | \| Send ICMP echo request and verify answer \ | | ... | \| ${nodes['TG']} \| eth2 \ | | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \ | | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \| diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot index c6bf2922cb..35905af02a 100644 --- a/resources/libraries/robot/ipv6.robot +++ b/resources/libraries/robot/ipv6.robot @@ -26,7 +26,7 @@ | Documentation | IPv6 keywords *** Keywords *** -| Ipv6 icmp echo +| Send IPv6 icmp echo request to DUT1 ingress inteface and verify answer | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT | | [Arguments] | ${tg_node} | ${dut_node} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${dut_node} @@ -41,11 +41,11 @@ | | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac} | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} -| | Vpp dump stats | ${dst_node} -| | ${ipv6_counter}= | Vpp get interface ipv6 counter | ${dst_node} | ${dst_port} +| | Get interface statistics | ${dst_node} +| | ${ipv6_counter}= | Get interface ipv6 counter | ${dst_node} | ${dst_port} | | Should Be Equal | ${ipv6_counter} | ${2} | #ICMPv6 neighbor advertisement + ICMPv6 echo request -| Ipv6 icmp echo sweep +| Execute IPv6 ICMP echo sweep | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size} | | ... | ${step} | ${nodes_addr} @@ -67,7 +67,7 @@ | | Run Traffic Script On Node | ipv6_sweep_ping.py | ${src_node} | ${args} | | ... | timeout=${180} -| Ipv6 tg to dut1 egress +| Send IPv6 ICMP echo request to DUT1 egress interface and verify answer | | [Documentation] | Send traffic from TG to first DUT egress interface | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut} @@ -85,7 +85,7 @@ | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} -| Ipv6 tg to dut2 via dut1 +| Send IPv6 ICMP echo request to DUT2 via DUT1 and verify answer | | [Documentation] | Send traffic from TG to second DUT through first DUT | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut} @@ -102,7 +102,7 @@ | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args} -| Ipv6 tg to dut2 egress via dut1 +| Send IPv6 ICMP echo request to DUT2 egress interface via DUT1 and verify answer | | [Documentation] | Send traffic from TG to second DUT egress interface through first DUT | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut} | ${tg_node} @@ -143,7 +143,7 @@ | | | ... | --dst_nh_mac ${dst_nh_mac} | --h_num 2 | | Run Traffic Script On Node | icmpv6_echo_req_resp.py | ${tg_node} | ${args} -| Ipv6 neighbor solicitation +| Send IPv6 neighbor solicitation and verify answer | | [Documentation] | Send IPv6 neighbor solicitation from TG to DUT | | [Arguments] | ${tg_node} | ${dut_node} | ${nodes_addr} | | Append Nodes | ${tg_node} | ${dut_node} @@ -159,10 +159,10 @@ | | | ... | ${dst_mac} | ${src_ip} | ${dst_ip} | | Run Traffic Script On Node | ipv6_ns.py | ${src_node} | ${args} -| Setup ipv6 to all dut in topology +| Configure IPv6 on all DUTs in topology | | [Documentation] | Setup IPv6 address on all DUTs | | [Arguments] | ${nodes} | ${nodes_addr} -| | Setup all DUTs before test +| | Configure all DUTs before test | | ${interfaces}= | Nodes Set Ipv6 Addresses | ${nodes} | ${nodes_addr} | | :FOR | ${interface} | IN | @{interfaces} | | | Set Interface State | @{interface} | up | if_type=name @@ -173,12 +173,12 @@ | | [Arguments] | ${nodes} | ${nodes_addr} | | Nodes Clear Ipv6 Addresses | ${nodes} | ${nodes_addr} -| Vpp nodes ra suppress link layer +| Suppress ICMPv6 router advertisement message | | [Documentation] | Suppress ICMPv6 router advertisement message for link scope address | | [Arguments] | ${nodes} | | Vpp All Ra Suppress Link Layer | ${nodes} -| Vpp nodes setup ipv6 routing +| Configure IPv6 routing on all DUTs | | [Documentation] | Setup routing on all VPP nodes required for IPv6 tests | | [Arguments] | ${nodes} | ${nodes_addr} | | Append Nodes | ${nodes['DUT1']} | ${nodes['DUT2']} diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot index b2653165d6..75ba532975 100644 --- a/resources/libraries/robot/l2_traffic.robot +++ b/resources/libraries/robot/l2_traffic.robot @@ -18,7 +18,7 @@ | Library | resources.libraries.python.TrafficScriptExecutor *** Keywords *** -| Send and receive ICMP Packet +| Send ICMP packet and verify received packet | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to \ | | ... | destination interface. Packet can be set with Dot1q or | | ... | Dot1ad tag(s) when required. @@ -46,15 +46,15 @@ | | ... | | ... | _NOTE:_ Default IP is IPv4 | | ... -| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \ +| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \ | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| -| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \ +| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \ | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \| -| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \ +| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \ | | ... | \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \| vlan2=220 \| -| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \ +| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \ | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \| encaps_rx=Dot1q \| -| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \ +| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \ | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \| encaps_rx=Dot1q \ | | ... | \| vlan1_rx=120 \| | | ... @@ -85,7 +85,7 @@ | | ... | ELSE | Catenate | ${args} | --vlan2_rx ${vlan2_rx} | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} -| Send and receive ICMP Packet should fail +| ICMP packet transmission should fail | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to | | ... | destination interface and expect failure with | | ... | ICMP echo Rx timeout error message. @@ -106,7 +106,7 @@ | | ... | | ... | _NOTE:_ Default IP is IPv4 | | ... -| | ... | \| Send and receive ICMP Packet should fail\| ${nodes['TG']} \ +| | ... | \| ICMP packet transmission should fail\| ${nodes['TG']} \ | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| | | ... | | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} | @@ -120,7 +120,7 @@ | | Run Keyword And Expect Error | ICMP echo Rx timeout | | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args} -| Send and receive ICMPv4 bidirectionally +| Send ICMPv4 bidirectionally and verify received packets | | [Documentation] | Send ICMPv4 echo request from both directions, | | ... | from interface1 to interface2 and | | ... | from interface2 to interface1. @@ -139,17 +139,17 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send and receive ICMPv4 bidirectionally \| ${nodes['TG']} \ +| | ... | \| Send ICMPv4 bidirectionally and verify received packets \| ${nodes['TG']} \ | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| | | ... | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=192.168.100.1 | | | ... | ${dst_ip}=192.168.100.2 -| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} | +| | Send ICMP packet and verify received packet | ${tg_node} | ${int1} | ${int2} | | | ... | ${src_ip} | ${dst_ip} -| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} | +| | Send ICMP packet and verify received packet | ${tg_node} | ${int2} | ${int1} | | | ... | ${dst_ip} | ${src_ip} -| Send and receive ICMPv6 bidirectionally +| Send ICMPv6 bidirectionally and verify received packets | | [Documentation] | Send ICMPv6 echo request from both directions, | | ... | from interface1 to interface2 and | | ... | from interface2 to interface1. @@ -168,12 +168,12 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send and receive ICMPv6 bidirectionally \| ${nodes['TG']} \ +| | ... | \| Send ICMPv6 bidirectionally and verify received packets \| ${nodes['TG']} \ | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \| | | ... | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=3ffe:63::1 | | | ... | ${dst_ip}=3ffe:63::2 -| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} | +| | Send ICMP packet and verify received packet | ${tg_node} | ${int1} | ${int2} | | | ... | ${src_ip} | ${dst_ip} -| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} | +| | Send ICMP packet and verify received packet | ${tg_node} | ${int2} | ${int1} | | | ... | ${dst_ip} | ${src_ip} diff --git a/resources/libraries/robot/l2_xconnect.robot b/resources/libraries/robot/l2_xconnect.robot index 4266234e10..00d33e867a 100644 --- a/resources/libraries/robot/l2_xconnect.robot +++ b/resources/libraries/robot/l2_xconnect.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.InterfaceUtil *** Keywords *** -| L2 setup xconnect on DUT +| Configure L2XC | | [Documentation] | Setup Bidirectional Cross Connect on DUTs | | [Arguments] | ${node} | ${if1} | ${if2} | | | Set Interface State | ${node} | ${if1} | up diff --git a/resources/libraries/robot/lisp/l2lisp.robot b/resources/libraries/robot/lisp/l2lisp.robot index c393493fa2..3e908a2378 100644 --- a/resources/libraries/robot/lisp/l2lisp.robot +++ b/resources/libraries/robot/lisp/l2lisp.robot @@ -24,7 +24,7 @@ | Library | resources.libraries.python.LispSetup.LispEidTableMap *** Keywords *** -| Set up L2 Lisp on DUT +| Configure L2 LISP on DUT | | [Documentation] | Set up LISP L2 topology. | | ... | | ... | *Arguments:* @@ -36,7 +36,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Set up LISP GPE topology \| ${dut_node} \| ${adjacency} \ +| | ... | \| Configure LISP GPE topology in 3-node circular topology \| ${dut_node} \| ${adjacency} \ | | ... | \| ${settings} \| | | ... | | [Arguments] diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot index a8b59e0fee..1f431245be 100644 --- a/resources/libraries/robot/lisp/lisp_api.robot +++ b/resources/libraries/robot/lisp/lisp_api.robot @@ -21,14 +21,14 @@ *** Keywords *** -| Lisp locator_set data is prepared +| Generate LISP locator_set data | | [Documentation] | Generate lisp locator_set data for test -| | ... | the lisp locator_set and locator API. +| | ... | the lisp locator_set and locator API. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - locator_set_number - Number how many locator_set data -| | ... | will be generated. Type: integer +| | ... | will be generated. Type: integer | | ... | | ... | *Return:* | | ... | - No value returned @@ -39,7 +39,7 @@ | | ... | from VAT. | | ... | | ... | *Example:* -| | ... | \| Given Lisp locator_set data is prepared \| ${nodes['DUT1']} \ +| | ... | \| Given Generate LISP locator_set data \| ${nodes['DUT1']} \ | | ... | \| ${locator_set_number} \| | | ... | | [Arguments] | ${dut_node} | ${locator_set_number} @@ -49,7 +49,7 @@ | | Set Test Variable | ${locator_set_values} | | Set Test Variable | ${locator_set_values_vat} -| Lisp locator_set data is set +| Configure LISP locator_set data | | [Documentation] | Set the lisp locator_set and locator on the VPP node. | | ... | | ... | *Arguments:* @@ -60,16 +60,15 @@ | | ... | | ... | _NOTE:_ This KW requires following test case variables: | | ... | - locator_set_values - Generated locator_set data from -| | ... | KW locator_set data is prepared, -| | ... | which will be set on the VPP node. +| | ... | KW locator_set data is prepared, which will be set on the VPP node. | | ... | | ... | *Example:* -| | ... | \| When Lisp locator_set data is set \| ${nodes['DUT1']} \| +| | ... | \| When Configure LISP locator_set data \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | Vpp Set Lisp Locator Set | ${dut_node} | ${locator_set_values} -| Lisp locator_set is set correctly +| LISP locator_set shpuld be configured correctly | | [Documentation] | Test if the locator_set is set correctly on the VPP node. | | ... | | ... | *Arguments:* @@ -83,14 +82,15 @@ | | ... | KW locator_set data is prepared, which are expected from VPP via VAT. | | ... | | ... | *Example:* -| | ... | \| Then Lisp locator_set is set correctly \| ${nodes['DUT1']} \| +| | ... | \| Then LISP locator_set shpuld be configured correctly \ +| | ... | \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | local | | Lisp Locator S Should Be Equal | | ... | ${locator_set_values_vat} | ${show_locator_set} -| Delete all lisp locator_set from VPP +| Delete all LISP locator_set from VPP | | [Documentation] | Delete all lisp locator_set on the VPP node. | | ... | | ... | *Arguments:* @@ -101,17 +101,16 @@ | | ... | | ... | _NOTE:_ This KW requires following test case variables: | | ... | - locator_set_values - Generated locator_set data from -| | ... | KW locator_set data is prepared, -| | ... | which was set on the VPP node. +| | ... | KW locator_set data is prepared, which was set on the VPP node. | | ... | | ... | *Example:* -| | ... | \| When Delete all lisp locator_set from VPP \ +| | ... | \| When Delete all LISP locator_set from VPP \ | | ... | \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | Vpp Unset Lisp Locator Set | ${dut_node} | ${locator_set_values} -| Lisp locator_set should be unset +| LISP locator_set should be unset | | [Documentation] | Test if all locator_set are unset from VPP node. | | ... | | ... | *Arguments:* @@ -121,7 +120,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Then Lisp locator_set should be unset \| ${nodes['DUT1']} \| +| | ... | \| Then LISP locator_set should be unset \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | ${EMPTY} @@ -129,12 +128,12 @@ | Lisp locator_set data use for test reset locator_set are prepared | | [Documentation] | Generate lisp special type of locator_set data. -| | ... | This data will be use for test reset locator_set. +| | ... | This data will be use for test reset locator_set. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - locator_set_number - Number how many locator_set data -| | ... | it will generate. Type: integer +| | ... | it will generate. Type: integer | | ... | | ... | *Return:* | | ... | - No value returned @@ -146,7 +145,7 @@ | | ... | | ... | *Example:* | | ... | \| Given Lisp locator_set data use for test reset locator_set \ -| | ... | are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \| +| | ... | are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \| | | ... | | [Arguments] | ${dut_node} | ${locator_set_number} | | ${locator_set_values} | ${locator_set_values_vat}= @@ -155,7 +154,7 @@ | | Set Test Variable | ${locator_set_values} | | Set Test Variable | ${locator_set_values_vat} -| Lisp eid address is set +| Configure LISP eid address | | [Documentation] | Set the lisp eid address on the VPP node. | | ... | | ... | *Arguments:* @@ -166,18 +165,19 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| When Lisp eid address is set \| ${nodes['DUT1']} \| ${eid_table} |\ +| | ... | \| When Configure LISP eid address \| ${nodes['DUT1']} \ +| | ... | \| ${eid_table} \| | | ... | | [Arguments] | ${dut_node} | ${set_eid} | | Vpp Set Lisp Eid Table | ${dut_node} | ${set_eid} -| Lisp eid address is set correctly to eid table +| LISP eid address should be set correctly to eid table | | [Documentation] | Test if the locator_set is set correctly on the VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - set_eid - Example eid data, which was set to the VPP node. -| | ... | Type: list +| | ... | Type: list | | ... | | ... | *Return:* | | ... | - No value returned @@ -186,32 +186,32 @@ | | ... | - set_eid - Generated eid data, which will be set to the VPP node. | | ... | | ... | *Example:* -| | ... | \| Then Lisp eid address is set correctly to eid table \ +| | ... | \| Then LISP eid address should be set correctly to eid table \ | | ... | \| ${nodes['DUT1']} \| ${eid_table} \| | | ... | | [Arguments] | ${dut_node} | ${set_eid} | | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node} | | Lisp Should Be Equal | ${set_eid} | ${show_eid} -| Delete all lisp eid address from VPP +| Delete all LISP eid address from VPP | | [Documentation] | Delete all lisp eid address from the VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - set_eid - Eid data which will be removed from the VPP node. -| | ... | Type: list +| | ... | Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| When Delete all lisp eid address from VPP \ +| | ... | \| When Delete all LISP eid address from VPP \ | | ... | \| ${nodes['DUT1']} \| ${eid_table} \| | | ... | | [Arguments] | ${dut_node} | ${set_eid} | | Vpp Unset Lisp Eid Table | ${dut_node} | ${set_eid} -| Lisp eid table should be empty +| LISP eid table should be empty | | [Documentation] | Test if the eid table is empty. | | ... | | ... | *Arguments:* @@ -221,69 +221,69 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Then Lisp eid table should be empty \| ${nodes['DUT1']} \| +| | ... | \| Then LISP eid table should be empty \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node} | | Lisp Is Empty | ${show_eid} -| Lisp map resolver address is set +| Configure LISP map resolver address | | [Documentation] | Set the lisp map resolver address in the VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - set_map_resolver - Map resolver data, which will be set on -| | ... | the VPP node. Type: list +| | ... | the VPP node. Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| When Lisp map resolver address is set \| ${nodes['DUT1']} \ +| | ... | \| When Configure LISP map resolver address \| ${nodes['DUT1']} \ | | ... | \| ${map_resolver} \| | | ... | | [Arguments] | ${dut_node} | ${set_map_resolver} | | Vpp Set Lisp Map Resolver | ${dut_node} | ${set_map_resolver} -| Lisp map resolver address is set correctly +| LISP map resolver address should be configured correctly | | [Documentation] | Test if the map resolver address is set correctly -| | ... | on the VPP node. +| | ... | on the VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - set_map_resolver - Map resolver data, which was set on -| | ... | the VPP node. Type: list +| | ... | the VPP node. Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Then Lisp map resolver address is set correctly \ +| | ... | \| Then LISP map resolver address should be configured correctly \ | | ... | \| ${nodes['DUT1']} \| ${map_resolver} \| | | ... | | [Arguments] | ${dut_node} | ${set_map_resolver} | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node} | | Lisp Should Be Equal | ${set_map_resolver} | ${show_map_resolver} -| Delete all lisp map resolver address from VPP +| Delete all LISP map resolver address from VPP | | [Documentation] | Delete all lisp map resolver address on the VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - map_resolver - Map resolver data, which will be remove from -| | ... | the VPP. Type: list +| | ... | the VPP. Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| When Delete all lisp map resolver address from VPP \ +| | ... | \| When Delete all LISP map resolver address from VPP \ | | ... | \| ${nodes['DUT1']} \| ${map_resolver} \| | | ... | | [Arguments] | ${dut_node} | ${set_map_resolver} | | Vpp Unset Lisp Map Resolver | ${dut_node} | ${set_map_resolver} -| Lip map resolver address should be empty +| LISP map resolver address should be empty | | [Documentation] | Test if the map resolver are empty. | | ... | | ... | *Arguments:* @@ -293,15 +293,15 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Then Lip map resolver address should be empty \ +| | ... | \| Then LISP map resolver address should be empty \ | | ... | \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node} | | Lisp Is Empty | ${show_map_resolver} -| Enable lisp -| | [Documentation] | Enable lisp on VPP node. +| Enable LISP +| | [Documentation] | Enable LISP on VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary @@ -310,32 +310,32 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Enable lisp \| ${nodes['DUT1']} \| +| | ... | \| Enable LISP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | Vpp Lisp Enable Disable | ${dut_node} | enable -| Check if lisp is enabled +| LISP should be enabled | | [Documentation] | Check if the lisp is enabled. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - lisp_status_data - Lisp status data, which was set on -| | ... | the VPP node. Type: list +| | ... | the VPP node. Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Check if lisp is enabled \| ${nodes['DUT1']} \ +| | ... | \| LISP should be enabled \| ${nodes['DUT1']} \ | | ... | \| ${lisp_status_data} \| | | ... | | [Arguments] | ${dut_node} | ${lisp_status_data} | | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node} | | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[1]} -| Disable lisp -| | [Documentation] | Disable lisp on VPP node. +| Disable LISP +| | [Documentation] | Disable LISP on VPP node. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary @@ -344,24 +344,24 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Disable lisp \| ${nodes['DUT1']} \| +| | ... | \| Disable LISP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${dut_node} | | Vpp Lisp Enable Disable | ${dut_node} | disable -| Check if lisp is disabled -| | [Documentation] | Check if lisp is disabled. +| LISP Should be disabled +| | [Documentation] | LISP Should be disabled. | | ... | | ... | *Arguments:* | | ... | - dut_node - DUT node. Type: dictionary | | ... | - lisp_status_data - Lisp status data, which was set on -| | ... | the VPP node. Type: list +| | ... | the VPP node. Type: list | | ... | | ... | *Return:* | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Check if lisp is disabled \| ${nodes['DUT1']} \ +| | ... | \| LISP Should be disabled \| ${nodes['DUT1']} \ | | ... | \| ${lisp_status_data} \| | | ... | | [Arguments] | ${dut_node} | ${lisp_status_data} diff --git a/resources/libraries/robot/lisp/lisp_static_adjacency.robot b/resources/libraries/robot/lisp/lisp_static_adjacency.robot index 0a4f438e5f..737c535ce8 100644 --- a/resources/libraries/robot/lisp/lisp_static_adjacency.robot +++ b/resources/libraries/robot/lisp/lisp_static_adjacency.robot @@ -22,7 +22,7 @@ | Library | resources.libraries.python.IPv4Util.IPv4Util *** Keywords *** -| Set up Lisp topology +| Configure LISP topology in 3-node circular topology | | [Documentation] | Set up Lisp static adjacency topology. | | ... | | ... | *Arguments:* @@ -42,7 +42,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Set up Lisp topology \| ${dut1_node} \| ${interface_name} \ +| | ... | \| Configure LISP topology in 3-node circular topology \| ${dut1_node} \| ${interface_name} \ | | ... | \| None \| ${dut2_node} \| ${interface_name} \| None \ | | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \ | | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \| @@ -98,7 +98,7 @@ | | ... | ${dut2_static_adjacency['seid']} | | ... | ${dut2_static_adjacency['prefix']} -| Change Lisp Configuration +| Change LISP Configuration | | [Documentation] | Change configuration of the Lisp protocol. | | ... | | ... | *Arguments:* @@ -124,7 +124,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Change Lisp Configuration \| ${dut1_node} \| ${dut2_node} \ +| | ... | \| Change LISP Configuration \| ${dut1_node} \| ${dut2_node} \ | | ... | \| ${dut1_to_dut2} \| ${dut2_to_dut1} | "08:00:27:20:e0:0d" \ | | ... | \| "08:00:27:b1:94:b1" \| "6.3.0.1" \| "6.3.0.20" \| "24" \ | | ... | \| ${old_dut1_static_adjacency} \| ${new_dut1_static_adjacency} \| diff --git a/resources/libraries/robot/lisp/lispgpe.robot b/resources/libraries/robot/lisp/lispgpe.robot index 7dc53c7e27..c39b64cf3f 100644 --- a/resources/libraries/robot/lisp/lispgpe.robot +++ b/resources/libraries/robot/lisp/lispgpe.robot @@ -23,8 +23,8 @@ | Library | resources.libraries.python.LispSetup.LispEidTableMap *** Keywords *** -| Set up LISP GPE topology -| | [Documentation] | Set up LISP GPE topology. +| Configure LISP GPE topology in 3-node circular topology +| | [Documentation] | Configure LISP GPE topology in 3-node circular topology. | | ... | | ... | *Arguments:* | | ... | - dut1_node - DUT1 node. Type: dictionary @@ -43,7 +43,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Set up LISP GPE topology \| ${dut1_node} \| ${interface_name} \ +| | ... | \| Configure LISP GPE topology in 3-node circular topology \| ${dut1_node} \| ${interface_name} \ | | ... | \| None \| ${dut2_node} \| ${interface_name} \| None \ | | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \ | | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \| diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index b8a0f08d9c..9435d82897 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -73,7 +73,7 @@ | | ... | Return From Keyword | 353.83333 | | Return From Keyword | ${framesize} -| 2-node circular Topology Variables Setup +| Set variables in 2-node circular topology | | [Documentation] | | ... | Compute path for testing on two given nodes in circular | | ... | topology and set corresponding suite variables. @@ -99,7 +99,7 @@ | | Set Suite Variable | ${dut1_if1} | | Set Suite Variable | ${dut1_if2} -| 3-node circular Topology Variables Setup +| Set variables in 3-node circular topology | | [Documentation] | | ... | Compute path for testing on three given nodes in circular | | ... | topology and set corresponding suite variables. @@ -134,7 +134,7 @@ | | Set Suite Variable | ${dut2_if1} | | Set Suite Variable | ${dut2_if2} -| 2-node circular Topology Variables Setup with DUT interface model +| Set variables in 2-node circular topology with DUT interface model | | [Documentation] | | ... | Compute path for testing on two given nodes in circular topology | | ... | based on interface model provided as an argument and set @@ -153,7 +153,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| 2-node circular Topology Variables Setup with DUT interface model \ +| | ... | \| Set variables in 2-node circular topology with DUT interface model\ | | ... | \| Intel-X520-DA2 \| | | ... | | [Arguments] | ${iface_model} @@ -174,7 +174,7 @@ | | Set Suite Variable | ${dut1_if1} | | Set Suite Variable | ${dut1_if2} -| 3-node circular Topology Variables Setup with DUT interface model +| Set variables in 3-node circular topology with DUT interface model | | [Documentation] | | ... | Compute path for testing on three given nodes in circular topology | | ... | based on interface model provided as an argument and set @@ -196,7 +196,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| 3-node circular Topology Variables Setup with DUT interface model \ +| | ... | \| Set variables in 3-node circular topology with DUT interface model\ | | ... | \| Intel-X520-DA2 \| | | ... | | [Arguments] | ${iface_model} @@ -223,7 +223,7 @@ | | Set Suite Variable | ${dut2_if1} | | Set Suite Variable | ${dut2_if2} -| VPP interfaces in path are up in a 2-node circular topology +| Set interfaces in path in 2-node circular topology up | | [Documentation] | | ... | *Set UP state on VPP interfaces in path on nodes in 2-node circular | | ... | topology.* @@ -232,7 +232,7 @@ | | Set Interface State | ${dut1} | ${dut1_if2} | up | | Vpp Node Interfaces Ready Wait | ${dut1} -| VPP interfaces in path are up in a 3-node circular topology +| Set interfaces in path in 3-node circular topology up | | [Documentation] | | ... | *Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology.* @@ -244,7 +244,7 @@ | | Vpp Node Interfaces Ready Wait | ${dut1} | | Vpp Node Interfaces Ready Wait | ${dut2} -| IPsec initialized in a 3-node circular topology +| Initialize IPSec in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP @@ -255,7 +255,7 @@ | | ... | | VPP Show Crypto Device Mapping | ${dut1} | | VPP Show Crypto Device Mapping | ${dut2} -| | VPP interfaces in path are up in a 3-node circular topology +| | Set interfaces in path in 3-node circular topology up | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1} @@ -272,14 +272,14 @@ | | Set Test Variable | ${dut1_if2_mac} | | Set Test Variable | ${dut2_if1_mac} | | Set Test Variable | ${dut2_if2_mac} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | ${dut1_if1_ip4} -| | ... | 24 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | ${dut1_if2_ip4} -| | ... | 24 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | ${dut2_if1_ip4} -| | ... | 24 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | ${dut2_if2_ip4} -| | ... | 24 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | ... | ${dut1_if1_ip4} | 24 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} +| | ... | ${dut1_if2_ip4} | 24 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} +| | ... | ${dut2_if1_ip4} | 24 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} +| | ... | ${dut2_if2_ip4} | 24 | | Add arp on dut | ${dut1} | ${dut1_if1} | ${tg_if1_ip4} | ${tg_if1_mac} | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_if1_ip4} | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac} @@ -287,7 +287,7 @@ | | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | ${tg_if1_ip4} | ${dut1_if1} | | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | ${tg_if2_ip4} | ${dut2_if2} -| IPv4 forwarding initialized in a 3-node circular topology +| Initialize IPv4 forwarding in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP @@ -315,7 +315,7 @@ | | dut2_v4.set_route | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} | | All Vpp Interfaces Ready Wait | ${nodes} -| IPv4 forwarding initialized in a 2-node switched topology +| Initialize IPv4 forwarding in 2-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP @@ -333,7 +333,7 @@ | | dut1_v4.set_ip | ${dut1_if2} | 20.20.20.2 | 24 | | All Vpp Interfaces Ready Wait | ${nodes} -| Scale IPv4 forwarding initialized in a 3-node circular topology +| Initialize IPv4 forwarding with scaling in 3-node circular topology | | [Documentation] | | ... | Custom setup of IPv4 topology with scalability of ip routes on all | | ... | DUT nodes in 3-node circular topology @@ -346,8 +346,8 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Scale IPv4 forwarding initialized in a 3-node circular topology \ -| | ... | \| 100000 \| +| | ... | \| Initialize IPv4 forwarding with scaling in 3-node circular \ +| | ... | topology \| 100000 \| | | ... | | [Arguments] | ${count} | | ... @@ -363,10 +363,10 @@ | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${dut1_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | 3.3.3.1 | ${tg1_if2_mac} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.2 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.2 | 30 | | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | 1.1.1.1 | ${dut1_if1} | | ... | count=${count} | | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2} @@ -377,7 +377,7 @@ | | ... | count=${count} | | All Vpp Interfaces Ready Wait | ${nodes} -| IPv4 forwarding with vhost initialized in a 3-node circular topology +| Initialize IPv4 forwarding with vhost in 3-node circular topology | | [Documentation] | | ... | Create vhost-user interfaces in VPP. Set UP state of all VPP | | ... | interfaces in path on nodes in 3-node circular topology. Create 2 @@ -402,14 +402,14 @@ | | ... | | [Arguments] | ${sock1} | ${sock2} | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Set interfaces in path in 3-node circular topology up +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} | | ${dut1_vif1}= | Set Variable | ${vhost_if1} | | ${dut1_vif2}= | Set Variable | ${vhost_if2} | | Set Interface State | ${dut1} | ${dut1_vif1} | up | | Set Interface State | ${dut1} | ${dut1_vif2} | up -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} | | ${dut2_vif1}= | Set Variable | ${vhost_if1} | | ${dut2_vif2}= | Set Variable | ${vhost_if2} @@ -447,14 +447,14 @@ | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif1} | ${fib_table_1} | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2} | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif2} | ${fib_table_2} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} @@ -496,7 +496,7 @@ | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 5.5.5.2 | ${dut2_vif2} | | ... | vrf=${fib_table_2} -| IPv4 forwarding with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology +| Initialize IPv4 forwarding with vhost for '${nr}' VMs in 3-node circular topology | | [Documentation] | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all | | ... | VPP nodes. Set UP state of all VPP interfaces in path. Create ${nr}+1 @@ -523,7 +523,7 @@ | | ... | \| IPv4 forwarding with Vhost-User for '2' VMs initialized in \ | | ... | a 3-node circular topology \| | | ... -| | VPP interfaces in path are up in a 3-node circular topology +| | Set interfaces in path in 3-node circular topology up | | ${fib_table_1}= | Set Variable | ${101} | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr} | | ${dut1_if1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if1} @@ -542,10 +542,10 @@ | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2} | | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1} | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} @@ -574,7 +574,7 @@ | | | ... | ${ip_base_vif1}.${ip_base_vif1}.${ip_base_vif1} | | | ${ip_net_vif2}= | Set Variable | | | ... | ${ip_base_vif2}.${ip_base_vif2}.${ip_base_vif2} -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1 | | | ... | dut1-vhost-${number}-if2 | | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up @@ -583,7 +583,7 @@ | | | ... | ${dut1-vhost-${number}-if1} | | | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1} | | | ... | ${dut1-vhost-${number}-if2} -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | | Configure vhost interfaces for L2BD forwarding | ${dut2} | | | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1 | | | ... | dut2-vhost-${number}-if2 | | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if1} | up @@ -608,7 +608,7 @@ | | | ... | ${fib_table_1} | | | Assign Interface To Fib Table | ${dut2} | ${dut2-vhost-${number}-if2} | | | ... | ${fib_table_2} -| | | IP addresses are set on interfaces +| | | Configure IP addresses on interfaces | | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30 | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${ip_net_vif2}.1 | 30 | | | ... | ${dut2} | ${dut2-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30 @@ -648,7 +648,7 @@ | | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 | | | ... | ${dut2-vhost-${number}-if2} | vrf=${fib_table_2} -| IPv4 policer 2r3c-${t} initialized in a 3-node circular topology +| Initialize IPv4 policer 2r3c-${t} in 3-node circular topology | | [Documentation] | | ... | Setup of 2r3c color-aware or color-blind policer with dst ip match | | ... | on all DUT nodes in 3-node circular topology. Policer is applied on @@ -678,7 +678,7 @@ | | Policer Classify Set Match IP | 10.10.10.2 | ${False} | | Policer Set Configuration -| IPv6 forwarding initialized in a 3-node circular topology +| Initialize IPv6 forwarding in 3-node circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular | | ... | topology. Get the interface MAC addresses and setup neighbour on all @@ -695,7 +695,7 @@ | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | 2001:3::1 | ${prefix} | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix} | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | 2001:2::1 | ${prefix} -| | Vpp nodes ra suppress link layer | ${nodes} +| | Suppress ICMPv6 router advertisement message | ${nodes} | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac} @@ -703,7 +703,7 @@ | | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2} | | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1} -| Scale IPv6 forwarding initialized in a 3-node circular topology +| Initialize IPv6 forwarding with scaling in 3-node circular topology | | [Documentation] | | ... | Custom setup of IPv6 topology with scalability of ip routes on all | | ... | DUT nodes in 3-node circular topology @@ -716,8 +716,8 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Scale IPv6 forwarding initialized in a 3-node circular topology \ -| | ... | \| 100000 \| +| | ... | \| Initialize IPv6 forwarding with scaling in 3-node circular \ +| | ... | topology \| 100000 \| | | ... | | [Arguments] | ${count} | | ... @@ -731,7 +731,7 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | Vpp nodes ra suppress link layer | ${nodes} +| | Suppress ICMPv6 router advertisement message | ${nodes} | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:3::2 | ${tg1_if1_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:4::2 | ${dut2_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac} @@ -745,7 +745,7 @@ | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2 | | ... | interface=${dut2_if2} | count=${count} -| IPv6 iAcl whitelist initialized in a 3-node circular topology +| Initialize IPv6 iAcl whitelist in 3-node circular topology | | [Documentation] | | ... | Creates classify L3 table on DUTs. IPv6 iAcl security whitelist | | ... | ingress /64 filter entries applied on links TG - DUT1 and DUT2 - TG. @@ -765,16 +765,16 @@ | | And Vpp Enable Input Acl Interface | | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx} -| L2 xconnect initialized in a 3-node circular topology +| Initialize L2 xconnect in 3-node circular topology | | [Documentation] | | ... | Setup L2 xconnect topology by cross connecting two interfaces on | | ... | each DUT. Interfaces are brought up. | | ... | -| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2} -| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2} +| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1_if2} +| | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | [Documentation] | | ... | Setup L2 xconnect topology with VXLANoIPv4 by cross connecting | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought @@ -782,21 +782,21 @@ | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as | | ... | interfaces. | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 +| | Set interfaces in path in 3-node circular topology up +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac} | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24 | | ... | 172.16.0.1 | 172.16.0.2 -| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1s_vxlan} +| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24 | | ... | 172.16.0.2 | 172.16.0.1 -| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${dut2s_vxlan} +| | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2s_vxlan} -| L2 xconnect with Vhost-User initialized in a 3-node circular topology +| Initialize L2 xconnect with Vhost-User in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross | | ... | connect each Vhost interface with one physical interface. @@ -812,17 +812,17 @@ | | ... | | [Arguments] | ${sock1} | ${sock2} | | ... -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1} -| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if2} | ${vhost_if2} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} +| | Configure L2XC | ${dut1} | ${dut1_if2} | ${vhost_if2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} -| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${vhost_if1} -| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2} +| | Configure L2XC | ${dut2} | ${dut2_if1} | ${vhost_if1} +| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 xconnect with Vhost-User for '${nr}' initialized in a 3-node circular topology +| Initialize L2 xconnect with Vhost-User for '${nr}' in 3-node circular topology | | [Documentation] | | ... | Create pairs of Vhost-User interfaces on all defined VPP nodes. Cross | | ... | connect each Vhost interface with one physical interface or virtual @@ -845,26 +845,26 @@ | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 | | | ${prev_index}= | Evaluate | ${number}-1 -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1 | | | ... | dut1-vhost-${number}-if2 | | | ${dut1_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut1_if1} | | | ... | ${dut1-vhost-${prev_index}-if2} -| | | L2 setup xconnect on DUT | ${dut1} | ${dut1_xconnect_if1} +| | | Configure L2XC | ${dut1} | ${dut1_xconnect_if1} | | | ... | ${dut1-vhost-${number}-if1} -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | | Configure vhost interfaces for L2BD forwarding | ${dut2} | | | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1 | | | ... | dut2-vhost-${number}-if2 | | | ${dut2_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut2_if1} | | | ... | ${dut2-vhost-${prev_index}-if2} -| | | L2 setup xconnect on DUT | ${dut2} | ${dut2_xconnect_if1} +| | | Configure L2XC | ${dut2} | ${dut2_xconnect_if1} | | | ... | ${dut2-vhost-${number}-if1} -| | | Run Keyword If | ${number}==${nr} | L2 setup xconnect on DUT +| | | Run Keyword If | ${number}==${nr} | Configure L2XC | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${dut1_if2} -| | | Run Keyword If | ${number}==${nr} | L2 setup xconnect on DUT +| | | Run Keyword If | ${number}==${nr} | Configure L2XC | | | ... | ${dut2} | ${dut2-vhost-${number}-if2} | ${dut2_if2} -| L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross | | ... | connect each Vhost interface with one physical interface. @@ -883,33 +883,33 @@ | | ... | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | VLAN dot1q subinterfaces initialized on 3-node topology +| | Set interfaces in path in 3-node circular topology up +| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | L2 tag rewrite method setup on interfaces +| | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1} -| | L2 setup xconnect on DUT | ${dut1} | ${subif_index_1} | ${vhost_if2} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} +| | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} -| | L2 setup xconnect on DUT | ${dut2} | ${subif_index_2} | ${vhost_if1} -| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2} +| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} +| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domain initialized in a 3-node circular topology +| Initialize L2 bridge domain in 3-node circular topology | | [Documentation] | | ... | Setup L2 DB topology by adding two interfaces on each DUT into BD | | ... | that is created automatically with index 1. Learning is enabled. | | ... | Interfaces are brought up. | | ... -| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2} -| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} +| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2} +| | Configure L2BD forwarding | ${dut2} | ${dut2_if1} | ${dut2_if2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each | | ... | Vhost-User interface into L2 bridge domains with learning enabled @@ -928,21 +928,21 @@ | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ... -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domains with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology +| Initialize L2 bridge domains with Vhost-User for '${nr}' VMs in 3-node circular topology | | [Documentation] | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all | | ... | defined VPP nodes. Add each Vhost-User interface into L2 bridge @@ -963,30 +963,30 @@ | | ... | a 3-node circular topology \| | | ... | | ${bd_id2}= | Evaluate | ${nr}+1 -| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${1} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${1} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${1} +| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${1} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1 | | | ... | dut1-vhost-${number}-if2 | | | ${bd_id2}= | Evaluate | ${number}+1 -| | | Interface is added to bridge domain | ${dut1} +| | | Add interface to bridge domain | ${dut1} | | | ... | ${dut1-vhost-${number}-if1} | ${number} -| | | Interface is added to bridge domain | ${dut1} +| | | Add interface to bridge domain | ${dut1} | | | ... | ${dut1-vhost-${number}-if2} | ${bd_id2} -| | | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | | Configure vhost interfaces for L2BD forwarding | ${dut2} | | | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1 | | | ... | dut2-vhost-${number}-if2 -| | | Interface is added to bridge domain | ${dut2} +| | | Add interface to bridge domain | ${dut2} | | | ... | ${dut2-vhost-${number}-if1} | ${number} -| | | Interface is added to bridge domain | ${dut2} +| | | Add interface to bridge domain | ${dut2} | | | ... | ${dut2-vhost-${number}-if2} | ${bd_id2} -| L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | [Documentation] | | ... | Setup L2 bridge domain topology with VXLANoIPv4 by connecting | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought @@ -994,9 +994,9 @@ | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as | | ... | interfaces. | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 +| | Set interfaces in path in 3-node circular topology up +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac} @@ -1005,11 +1005,11 @@ | | ... | 172.16.0.1 | 172.16.0.2 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24 | | ... | 172.16.0.2 | 172.16.0.1 -| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1s_vxlan} -| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if2} | ${dut2s_vxlan} +| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1s_vxlan} +| | Configure L2BD forwarding | ${dut2} | ${dut2_if2} | ${dut2s_vxlan} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each | | ... | Vhost-User interface into L2 bridge domains with learning enabled @@ -1032,28 +1032,28 @@ | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 +| | Set interfaces in path in 3-node circular topology up +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24 | | ... | 172.16.0.1 | 172.16.0.2 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24 | | ... | 172.16.0.2 | 172.16.0.1 -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domains with Vhost-User initialized in a 2-node circular topology +| Initialize L2 bridge domains with Vhost-User in 2-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each | | ... | Vhost-User interface into L2 bridge domains with learning enabled @@ -1072,15 +1072,15 @@ | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | | ... -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} | | All Vpp Interfaces Ready Wait | ${nodes} -| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each | | ... | Vhost-User interface into L2 bridge domains with learning enabled @@ -1104,27 +1104,27 @@ | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} | | ... -| | VPP interfaces in path are up in a 3-node circular topology -| | VLAN dot1q subinterfaces initialized on 3-node topology +| | Set interfaces in path in 3-node circular topology up +| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | L2 tag rewrite method setup on interfaces +| | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1} +| | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} -| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2} +| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} +| | Configure vhost interfaces for L2BD forwarding | ${dut2} | | ... | ${sock1} | ${sock2} -| | Interface is added to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} -| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} -| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} +| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} +| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | All Vpp Interfaces Ready Wait | ${nodes} -| 2-node Performance Suite Setup with DUT's NIC model +| Set up 2-node performance topology with DUT's NIC model | | [Documentation] | | ... | Suite preparation phase that setup default startup configuration of | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global @@ -1142,12 +1142,12 @@ | | [Arguments] | ${topology_type} | ${nic_model} | | ... | | Show vpp version on all DUTs -| | 2-node circular Topology Variables Setup with DUT interface model +| | Set variables in 2-node circular topology with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type} -| 2-node-switched Performance Suite Setup with DUT's NIC model +| Set up 2-node-switched performance topology with DUT's NIC model | | [Documentation] | | ... | Suite preparation phase that setup default startup configuration of | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global @@ -1169,13 +1169,13 @@ | | ... | ${tg_if2_dest_mac} | | ... | | Show vpp version on all DUTs -| | 2-node circular Topology Variables Setup with DUT interface model +| | Set variables in 2-node circular topology with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type} | | ... | ${tg_if1_dest_mac} | ${tg_if2_dest_mac} -| 3-node Performance Suite Setup with DUT's NIC model +| Set up 3-node performance topology with DUT's NIC model | | [Documentation] | | ... | Suite preparation phase that setup default startup configuration of | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global @@ -1188,23 +1188,24 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \| +| | ... | \| Set up 3-node performance topology with DUT's NIC model \| L2 \ +| | ... | \| Intel-X520-DA2 \| | | ... | | [Arguments] | ${topology_type} | ${nic_model} | | ... | | Show vpp version on all DUTs -| | 3-node circular Topology Variables Setup with DUT interface model +| | Set variables in 3-node circular topology with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type} -| 3-node Performance Suite Teardown +| Tear down 3-node performance topology | | [Documentation] | | ... | Suite teardown phase with traffic generator teardown. | | ... | | Teardown traffic generator | ${tg} -| 2-node Performance Suite Teardown +| Tear down 2-node performance topology | | [Documentation] | | ... | Suite teardown phase with traffic generator teardown. | | ... @@ -1576,7 +1577,7 @@ | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type} | | ... | | Return From Keyword If | ${rate} <= 10000 | ${-1} -| | ${ret}= | For DPDK Performance Test +| | ${ret}= | Is DPDK performance test | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs | | Send traffic on tg | ${duration} | ${rate}pps | ${framesize} | | ... | ${topology_type} | warmup_time=0 @@ -1606,7 +1607,7 @@ | | ... | | Clear and show runtime counters with running traffic | ${duration} | | ... | ${rate} | ${framesize} | ${topology_type} -| | ${ret}= | For DPDK Performance Test +| | ${ret}= | Is DPDK performance test | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs | | Send traffic on tg | ${duration} | ${rate} | ${framesize} | | ... | ${topology_type} | warmup_time=0 @@ -1637,7 +1638,7 @@ | | ... | | Clear and show runtime counters with running traffic | ${duration} | | ... | ${rate} | ${framesize} | ${topology_type} -| | ${ret}= | For DPDK Performance Test +| | ${ret}= | Is DPDK performance test | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs | | Send traffic on tg | ${duration} | ${rate} | ${framesize} | | ... | ${topology_type} | warmup_time=0 @@ -1666,13 +1667,13 @@ | | ... | | Send traffic on tg | -1 | ${rate} | ${framesize} | ${topology_type} | | ... | warmup_time=0 | async_call=${True} | latency=${False} -| | ${ret}= | For DPDK Performance Test +| | ${ret}= | Is DPDK performance test | | Run Keyword If | ${ret}==${FALSE} | Clear runtime counters on all DUTs | | Sleep | ${duration} | | Run Keyword If | ${ret}==${FALSE} | Show runtime counters on all DUTs | | Stop traffic on tg -| Add PCI devices to DUTs from 3-node single link topology +| Add PCI devices to DUTs in 3-node single link topology | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1} | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2} | | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1} @@ -1680,12 +1681,12 @@ | | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci} | | Add PCI device | ${dut2} | ${dut2_if1_pci} | ${dut2_if2_pci} -| Add PCI devices to DUTs from 2-node single link topology +| Add PCI devices to DUTs in 2-node single link topology | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1} | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2} | | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci} -| Guest VM with dpdk-testpmd connected via vhost-user is setup +| Configure guest VM with dpdk-testpmd connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd @@ -1706,10 +1707,10 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \ +| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \ | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \ | | ... | \| ${5} \| -| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \ +| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \ | | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \ | | ... | \| qemu_id=${2} \| | | ... @@ -1742,7 +1743,7 @@ | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz} | | Return From Keyword | ${vm} -| '${nr}' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| Configure '${nr}' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | [Documentation] | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd for defined number of VMs on all defined VPP nodes. @@ -1757,23 +1758,23 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| '2' Guest VM with dpdk-testpmd connected via vhost-user is setup \ +| | ... | \| '2' Configure guest VM with dpdk-testpmd connected via vhost-user \ | | ... | in a 3-node circular topology \| | | ... | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1 | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 | | | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus} -| | | ${vm1}= | Guest VM with dpdk-testpmd connected via vhost-user is setup +| | | ${vm1}= | Configure guest VM with dpdk-testpmd connected via vhost-user | | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number} | | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1} -| | | ${vm2}= | Guest VM with dpdk-testpmd connected via vhost-user is setup +| | | ${vm2}= | Configure guest VM with dpdk-testpmd connected via vhost-user | | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number} | | | ... | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} -| Guest VM with dpdk-testpmd using SMT connected via vhost-user is setup +| Configure guest VM with dpdk-testpmd using SMT connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd @@ -1819,7 +1820,7 @@ | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz} | | Return From Keyword | ${vm} -| Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd @@ -1881,7 +1882,7 @@ | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz} | | Return From Keyword | ${vm} -| '${nr}' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| Configure '${nr}' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | [Documentation] | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd with fwd mode set to mac rewrite for defined number of @@ -1904,20 +1905,20 @@ | | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 | | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 | | | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus} -| | | ${vm1}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | | ${vm1}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number} | | | ... | ${dut1-vhost-${number}-if1_mac} | | | ... | ${dut1-vhost-${number}-if2_mac} | skip=${skip_cpus} | | | ... | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1} -| | | ${vm2}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | | ${vm2}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number} | | | ... | ${dut2-vhost-${number}-if1_mac} | | | ... | ${dut2-vhost-${number}-if2_mac} | skip=${skip_cpus} | | | ... | count=${vm_cpus} | qemu_id=${number} | | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2} -| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user is setup +| Configure guest VM with dpdk-testpmd-mac using SMT connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd @@ -1937,8 +1938,8 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user \ -| | ... | is setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \ +| | ... | \| Configure guest VM with dpdk-testpmd-mac using SMT connected via \ +| | ... | vhost-user \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \ | | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${6} \| ${5} \| | | ... | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} @@ -1966,7 +1967,7 @@ | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz} | | Return From Keyword | ${vm} -| Guest VM with Linux Bridge connected via vhost-user is setup +| Configure guest VM with linux bridge connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | linux bridge. Qemu Guest uses 2048M. @@ -1981,7 +1982,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Guest VM with Linux Bridge connected via vhost-user is setup \ +| | ... | \| Configure guest VM with linux bridge connected via vhost-user \ | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \ | | ... | \| ${5} \| | | ... @@ -2013,7 +2014,7 @@ | | Set Interface State | ${vm} | ${br} | up | if_type=name | | Return From Keyword | ${vm} -| Guest VM with Linux Bridge using SMT connected via vhost-user is setup +| Configure guest VM with linux bridge using SMT connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting | | ... | linux bridge. Qemu Guest uses 2048M. @@ -2060,7 +2061,7 @@ | | Set Interface State | ${vm} | ${br} | up | if_type=name | | Return From Keyword | ${vm} -| Guest VM with dpdk-testpmd Teardown +| Tear down guest VM with dpdk-testpmd | | [Documentation] | | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}. | | ... | Argument is dictionary of all qemu nodes running with its names. @@ -2072,7 +2073,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Guest VM with dpdk-testpmd Teardown \| ${node['DUT1']} \ +| | ... | \| Tear down guest VM with dpdk-testpmd \| ${node['DUT1']} \ | | ... | \| ${dut_vm_refs} \| | | ... | | [Arguments] | ${dut_node} | ${dut_vm_refs} @@ -2086,7 +2087,7 @@ | | | Run Keyword | ${vm_name}.Qemu Clear Socks | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All -| Guest VM Teardown +| Tear down guest VM | | [Documentation] | | ... | Stop all qemu processes running on ${dut_node}. | | ... | Argument is dictionary of all qemu nodes running with its names. @@ -2097,7 +2098,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Guest VM Teardown \| ${node['DUT1']} \ +| | ... | \| Tear down guest VM \| ${node['DUT1']} \ | | ... | \| ${dut_vm_refs} \| | | ... | | [Arguments] | ${dut_node} | ${dut_vm_refs} @@ -2110,7 +2111,7 @@ | | | Run Keyword | ${vm_name}.Qemu Clear Socks | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All -| Lisp IPv4 forwarding initialized in a 3-node circular topology +| Initialize LISP IPv4 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \ | | ... | Don`t set route. | | ... @@ -2125,7 +2126,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Lisp IPv4 forwarding initialized in a 3-node circular topology \ +| | ... | \| Initialize LISP IPv4 forwarding in 3-node circular topology \ | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \ | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \| | | ... @@ -2146,17 +2147,17 @@ | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_address} | | ... | ${dut1_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_address} | ${duts_prefix} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | | ... | ${dut1_dut2_address} | ${duts_prefix} -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | | ... | ${dut2_dut1_address} | ${duts_prefix} -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | | ... | ${dut2_tg_address} | ${duts_prefix} | | All Vpp Interfaces Ready Wait | ${nodes} -| Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | [Documentation] | Setup Lisp GPE IPv4 forwarding over IPsec. | | ... | | ... | *Arguments:* @@ -2167,30 +2168,30 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology\ +| | ... | \| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology\ | | ... | \| ${encr_alg} \| ${auth_alg} | | ... | | [Arguments] | ${encr_alg} | ${auth_alg} | | ... -| | IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | Lisp IPv4 forwarding initialized in a 3-node circular topology +| | Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency} -| | VPP Setup IPsec Manual Keyed Connection +| | Configure manual keyed connection for IPSec | | ... | ${dut1} | ${dut1_if2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | VPP Setup IPsec Manual Keyed Connection +| | Configure manual keyed connection for IPSec | | ... | ${dut2} | ${dut2_if1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| Lisp IPv6 forwarding initialized in a 3-node circular topology +| Initialize LISP IPv6 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv6 topology on all DUT nodes \ | | ... | Don`t set route. | | ... @@ -2205,7 +2206,7 @@ | | ... | - No value returned | | ... | | ... | *Example:* -| | ... | \| Lisp IPv6 forwarding initialized in a 3-node circular topology \ +| | ... | \| Initialize LISP IPv6 forwarding in 3-node circular topology \ | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \ | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \| | | ... @@ -2224,7 +2225,7 @@ | | ... | ${prefix} | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_address} | | ... | ${prefix} -| | Vpp nodes ra suppress link layer | ${nodes} +| | Suppress ICMPv6 router advertisement message | ${nodes} | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_address} @@ -2232,7 +2233,7 @@ | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_address} | | ... | ${dut1_if2_mac} -| Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \ | | ... | Don`t set route. | | ... @@ -2267,15 +2268,15 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_ip4_address} | ${prefix4} | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | ${dut1_dut2_ip6_address} | | ... | ${prefix6} | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | ${dut2_dut1_ip6_address} | | ... | ${prefix6} -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | | ... | ${dut2_tg_ip4_address} | ${prefix4} -| | Vpp nodes ra suppress link layer | ${nodes} +| | Suppress ICMPv6 router advertisement message | ${nodes} | | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip6_address} @@ -2283,7 +2284,7 @@ | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip6_address} | | ... | ${dut1_if2_mac} -| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \ | | ... | Don`t set route. | | ... @@ -2320,13 +2321,13 @@ | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | ${dut1_tg_ip6_address} | | ... | ${prefix6} -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | | ... | ${dut1_dut2_ip4_address} | ${prefix4} -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | | ... | ${dut2_dut1_ip4_address} | ${prefix4} | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_ip6_address} | | ... | ${prefix6} -| | Vpp nodes ra suppress link layer | ${nodes} +| | Suppress ICMPv6 router advertisement message | ${nodes} | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip4_address} @@ -2334,7 +2335,7 @@ | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip4_address} | | ... | ${dut1_if2_mac} -| SNAT is initialized in a 3-node circular topology +| Initialize SNAT in 3-node circular topology | | [Documentation] | Initialization of 3-node topology with SNAT between DUTs: | | ... | - set interfaces up | | ... | - set IP addresses @@ -2348,10 +2349,10 @@ | | Set Interface State | ${dut2} | ${dut2_if2} | up | | All Vpp Interfaces Ready Wait | ${nodes} | | ... -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20 -| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 11.0.0.1 | 20 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 11.0.0.2 | 20 -| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 12.0.0.1 | 20 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20 +| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 11.0.0.1 | 20 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 11.0.0.2 | 20 +| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 12.0.0.1 | 20 | | ... | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} @@ -2368,10 +2369,10 @@ | | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | 12.0.0.2 | ${dut2_if2} | | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | 11.0.0.1 | ${dut2_if1} | | ... -| | Set inside and outside interfaces | ${dut1} | ${dut1_if1} | ${dut1_if2} -| | Set deterministic mode for SNAT | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30 +| | Configure inside and outside interfaces | ${dut1} | ${dut1_if1} | ${dut1_if2} +| | Configure deterministic mode for SNAT | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30 -| DPDK 2-node Performance Suite Setup with DUT's NIC model +| Set up DPDK 2-node performance topology with DUT's NIC model | | [Documentation] | | ... | Updates interfaces on all nodes and setup global | | ... | variables used in test cases based on interface model provided as an @@ -2384,18 +2385,18 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| DPDK 2-node Performance Suite Setup with DUT's NIC model \ +| | ... | \| Set up DPDK 2-node performance topology with DUT's NIC model \ | | ... | \| L2 \| Intel-X520-DA2 \| | | ... | | [Arguments] | ${topology_type} | ${nic_model} | | ... -| | 2-node circular Topology Variables Setup with DUT interface model +| | Set variables in 2-node circular topology with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type} | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2} -| DPDK 3-node Performance Suite Setup with DUT's NIC model +| Set up DPDK 3-node performance topology with DUT's NIC model | | [Documentation] | | ... | Updates interfaces on all nodes and setup global | | ... | variables used in test cases based on interface model provided as an @@ -2412,14 +2413,14 @@ | | ... | | [Arguments] | ${topology_type} | ${nic_model} | | ... -| | 3-node circular Topology Variables Setup with DUT interface model +| | Set variables in 3-node circular topology with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type} | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2} | | Initialize DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2} -| DPDK 3-node Performance Suite Teardown +| Tear down DPDK 3-node performance topology | | [Documentation] | | ... | Suite teardown phase with traffic generator teardown. | | ... | Cleanup DPDK test environment. @@ -2428,7 +2429,7 @@ | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2} | | Cleanup DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2} -| DPDK 2-node Performance Suite Teardown +| Tear down DPDK 2-node performance topology | | [Documentation] | | ... | Suite teardown phase with traffic generator teardown. | | ... | Cleanup DPDK test environment. @@ -2436,7 +2437,7 @@ | | Teardown traffic generator | ${tg} | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2} -| For DPDK Performance Test +| Is DPDK performance test | | [Documentation] | | ... | Return TRUE if variable DPDK_TEST exist, otherwise FALSE. | | ${ret} | ${tmp}= | Run Keyword And Ignore Error @@ -2444,12 +2445,12 @@ | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE} | | Return From Keyword | ${FALSE} -| Performance test setup +| Set up performance test | | [Documentation] | Common test setup for performance tests. | | ... | | Reset VAT History On All DUTs | ${nodes} -| Performance test teardown +| Tear down performance discovery test | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \ | | ... | tests. | | ... @@ -2460,7 +2461,8 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Performance test teardown \| 4.0mpps \| 64 \| 3-node-IPv4 \| +| | ... | \| Tear down performance discovery test \| 4.0mpps \| 64 \ +| | ... | \| 3-node-IPv4 \| | | ... | | [Arguments] | ${rate} | ${framesize} | ${topology_type} | | ... @@ -2471,7 +2473,7 @@ | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False} | | Remove startup configuration of VPP from all DUTs -| Performance ndrchk test teardown +| Tear down performance ndrchk test | | [Documentation] | Common test teardown for ndrchk performance tests. | | ... | | Show VAT History On All DUTs | ${nodes} @@ -2485,7 +2487,7 @@ | | Show statistics on all DUTs | | Remove startup configuration of VPP from all DUTs -| Performance test with vhost and VM with dpdk-testpmd teardown +| Tear down performance test with vhost and VM with dpdk-testpmd | | [Documentation] | Common test teardown for performance tests which use | | ... | vhost(s) and VM(s) with dpdk-testpmd. | | ... @@ -2500,7 +2502,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Performance test with vhost and VM with dpdk-testpmd teardown \ +| | ... | \| Tear down performance test with vhost and VM with dpdk-testpmd \ | | ... | \| 4.0mpps \| 64 \| 3-node-IPv4 \| ${node['DUT1']} \| ${dut_vm_refs} \ | | ... | \| ${node['DUT2']} \| ${dut_vm_refs} \| | | ... @@ -2509,13 +2511,13 @@ | | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None} | | ... | | Show VAT History On All DUTs | ${nodes} -| | Show Vpp Vhost On All DUTs +| | Show VPP vhost on all DUTs | | Show statistics on all DUTs | | Run Keyword If Test Failed | | ... | Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False} | | Remove startup configuration of VPP from all DUTs | | Run keyword unless | ${dut1_node}==${None} -| | ... | Guest VM with dpdk-testpmd Teardown | ${dut1} | ${dut1_vm_refs} +| | ... | Tear down guest VM with dpdk-testpmd | ${dut1} | ${dut1_vm_refs} | | Run keyword unless | ${dut2_node}==${None} -| | ... | Guest VM with dpdk-testpmd Teardown | ${dut2} | ${dut2_vm_refs} +| | ... | Tear down guest VM with dpdk-testpmd | ${dut2} | ${dut2_vm_refs} diff --git a/resources/libraries/robot/policer.robot b/resources/libraries/robot/policer.robot index bf67ab7894..6e75a45965 100644 --- a/resources/libraries/robot/policer.robot +++ b/resources/libraries/robot/policer.robot @@ -25,7 +25,7 @@ | Documentation | *Policer keywords* *** Keywords *** -| Setup Topology for IPv4 policer testing +| Configure topology for IPv4 policer test | | [Documentation] | Setup topology for IPv4 policer testing. | | ... | | ... | _NOTE:_ This KW sets following test case variables: @@ -33,9 +33,9 @@ | | ... | - dut_to_tg_if2_ip - DUT second interface IP address. Type: string | | ... | - tg_to_dut_if1_ip - TG first interface IP address. Type: string | | ... | - tg_to_dut_if2_ip - TG second interface IP address. Type: string -| | Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | Interfaces in 2-node path are up +| | Set interfaces in 2-node circular topology up | | Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip4} | ${ip4_plen} | | Set Interface Address | ${dut_node} | ${dut_to_tg_if2} @@ -47,7 +47,7 @@ | | Set Test Variable | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_ip4} | | Set Test Variable | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_ip4} -| Setup Topology for IPv6 policer testing +| Configure topology for IPv6 policer test | | [Documentation] | Setup topology for IPv6 policer testing. | | ... | | ... | _NOTE:_ This KW sets following test case variables: @@ -55,9 +55,9 @@ | | ... | - dut_to_tg_if2_ip - DUT second interface IP address. Type: string | | ... | - tg_to_dut_if1_ip - TG first interface IP address. Type: string | | ... | - tg_to_dut_if2_ip - TG second interface IP address. Type: string -| | Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | Interfaces in 2-node path are up +| | Set interfaces in 2-node circular topology up | | Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip6} | ${ip6_plen} | | Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if2} @@ -70,7 +70,7 @@ | | Set Test Variable | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_ip6} | | Set Test Variable | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_ip6} -| Send Packet and Verify Marking +| Send packet and verify marking | | [Documentation] | Send packet and verify DSCP of the received packet. | | ... | | ... | *Arguments:* @@ -85,7 +85,7 @@ | | ... | | ... | *Example:* | | ... | \| ${dscp}= \| DSCP AF22 \| -| | ... | \| Send Packet and Verify Marking \| ${nodes['TG']} \| eth1 \| eth2 \ +| | ... | \| Send packet and verify marking \| ${nodes['TG']} \| eth1 \| eth2 \ | | ... | \| 08:00:27:87:4d:f7 \| 52:54:00:d4:d8:22 \| 192.168.122.2 \ | | ... | \| 192.168.122.1 \| ${dscp} \| | | [Arguments] | ${node} | ${tx_if} | ${rx_if} | ${src_mac} | ${dst_mac} diff --git a/resources/libraries/robot/qemu.robot b/resources/libraries/robot/qemu.robot index 5d1e3d5959..097f3cb1a8 100644 --- a/resources/libraries/robot/qemu.robot +++ b/resources/libraries/robot/qemu.robot @@ -16,33 +16,33 @@ *** Keywords *** -| Exist QEMU Build List +| QEMU build list should exist | | [Documentation] | Return TRUE if variable QEMU_BUILD exist, otherwise FALSE | | ${ret} | ${tmp}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | @{QEMU_BUILD} | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE} | | Return From Keyword | ${FALSE} -| Is QEMU Ready on Node +| Is QEMU ready on node | | [Documentation] | Check if QEMU was built on the node before | | [Arguments] | ${node} -| | ${ret}= | Exist QEMU Build List +| | ${ret}= | QEMU build list should exist | | Return From Keyword If | ${ret} == ${FALSE} | ${FALSE} | | ${ret} | ${tmp}= | Run Keyword And Ignore Error | | ... | Should Contain | ${QEMU_BUILD} | ${node['host']} | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE} | | Return From Keyword | ${FALSE} -| Add Node to QEMU Build List +| Add node to QEMU build list | | [Documentation] | Add node to the list of nodes with builded QEMU (global | | ... | variable QEMU_BUILD) | | [Arguments] | ${node} -| | ${ret}= | Exist QEMU Build List +| | ${ret}= | QEMU build list should exist | | Run Keyword If | ${ret} == ${TRUE} | | ... | Append To List | ${QEMU_BUILD} | ${node['host']} | | ... | ELSE | Set Global Variable | @{QEMU_BUILD} | ${node['host']} -| Build QEMU on Node +| Build QEMU on node | | [Documentation] | Build QEMU from sources on the Node. Nodes with successful | | ... | QEMU build are stored in global variable list QEMU_BUILD | | ... @@ -54,13 +54,13 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Build QEMU on Node \| ${node['DUT1']} \| False \| False \| +| | ... | \| Build QEMU on node \| ${node['DUT1']} \| False \| False \| | | ... | | [Arguments] | ${node} | ${force_install}=${False} | ${apply_patch}=${False} -| | ${ready}= | Is QEMU Ready on Node | ${node} +| | ${ready}= | Is QEMU ready on node | ${node} | | Return From Keyword If | ${ready} == ${TRUE} | | Build QEMU | ${node} -| | Add Node to QEMU Build List | ${node} +| | Add node to QEMU build list | ${node} | Build QEMU on all DUTs | | [Documentation] | Build QEMU from sources on all DUTs. Nodes with successful @@ -78,10 +78,10 @@ | | [Arguments] | ${force_install}=${False} | ${apply_patch}=${False} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Build QEMU on Node | ${nodes['${dut}']} | ${force_install} | +| | | Build QEMU on node | ${nodes['${dut}']} | ${force_install} | | | | ... | ${apply_patch} -| Stop and Clear QEMU +| Stop and clear QEMU | | [Documentation] | Stop QEMU, clear used sockets and close SSH connection | | ... | running on ${dut}, ${vm} is VM node info dictionary | | ... | returned by qemu_start or None. diff --git a/resources/libraries/robot/snat.robot b/resources/libraries/robot/snat.robot index 12c7a71369..610a9150ee 100644 --- a/resources/libraries/robot/snat.robot +++ b/resources/libraries/robot/snat.robot @@ -17,8 +17,8 @@ | Documentation | Keywords for SNAT feature in VPP. *** Keywords *** -| Set inside and outside interfaces -| | [Documentation] | Set inside and outside interfaces for SNAT. +| Configure inside and outside interfaces +| | [Documentation] | Configure inside and outside interfaces for SNAT. | | ... | | ... | *Arguments:* | | ... | - node - DUT node to set SNAT interfaces on. Type: dictionary @@ -27,7 +27,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Set inside and outside interfaces \| ${nodes['DUT1']} \ +| | ... | \| Configure inside and outside interfaces \| ${nodes['DUT1']} \ | | ... | \| FortyGigabitEtherneta/0/0 \| FortyGigabitEtherneta/0/1 \| | | ... | | [Arguments] | ${node} | ${int_in} | ${int_out} @@ -36,7 +36,7 @@ | | ${int_out_name}= | Set variable | ${node['interfaces']['${int_out}']['name']} | | Set SNAT Interfaces | ${node} | ${int_in_name} | ${int_out_name} -| Set deterministic mode for SNAT +| Configure deterministic mode for SNAT | | [Documentation] | Set deterministic behaviour of SNAT. | | ... | | ... | *Arguments:* @@ -49,7 +49,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Set deterministic mode for SNAT \| ${nodes['DUT1']} \ +| | ... | \| Configure deterministic mode for SNAT \| ${nodes['DUT1']} \ | | ... | \| 100.0.0.0 \| 12 \| 12.1.1.0 \| 24 \| | | ... | | [Arguments] | ${node} | ${ip_in} | ${subnet_in} | ${ip_out} | ${subnet_out} @@ -57,8 +57,8 @@ | | Set SNAT deterministic | ${node} | ${ip_in} | ${subnet_in} | ${ip_out} | | ... | ${subnet_out} -| Set workers for SNAT -| | [Documentation] | Set workers for SNAT. +| Configure workers for SNAT +| | [Documentation] | Configure workers for SNAT. | | ... | | ... | *Arguments:* | | ... | - node - DUT node to set SNAT workers on. Type: dictionary @@ -67,7 +67,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Set workers for SNAT \| ${nodes['DUT1']} \| 12-23,36-47 \| +| | ... | \| Configure workers for SNAT \| ${nodes['DUT1']} \| 12-23,36-47 \| | | ... | | [Arguments] | ${node} | ${lcores} | | ... diff --git a/resources/libraries/robot/tagging.robot b/resources/libraries/robot/tagging.robot index 1e481a2e5d..431812b3ab 100644 --- a/resources/libraries/robot/tagging.robot +++ b/resources/libraries/robot/tagging.robot @@ -21,7 +21,7 @@ *** Keywords *** -| VLAN subinterfaces initialized on 3-node topology +| Initialize VLAN sub-interfaces in 3-node circular topology | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID} | | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} | ${TYPE_SUBIF} | | [Documentation] | *Create two subinterfaces on DUTs.* @@ -59,7 +59,7 @@ | | Set Test Variable | ${subif_name_2} | | Set Test Variable | ${subif_index_2} -| VLAN dot1q subinterfaces initialized on 3-node topology +| Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID} | | [Documentation] | *Create two dot1q subinterfaces on DUTs.* | | ... @@ -78,7 +78,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| VLAN dot1q subinterfaces initialized on 3-node topology \ +| | ... | \| Initialize VLAN dot1q sub-interfaces in 3-node circular topology \ | | ... | \| ${nodes['DUT1']} \| ${dut1_if2} \| ${nodes['DUT2']} \ | | ... | \| ${dut1_if2} \| 10 \| | | ... @@ -95,7 +95,7 @@ | | Set Test Variable | ${subif_name_2} | | Set Test Variable | ${subif_index_2} -| L2 tag rewrite method setup on interfaces +| Configure L2 tag rewrite method on interfaces | | [Arguments] | ${DUT1} | ${SUB_INT1} | ${DUT2} | ${SUB_INT2} | | ... | ${TAG_REWRITE_METHOD} | | [Documentation] | *Setup tag rewrite on sub-interfaces on DUTs.* @@ -110,7 +110,7 @@ | | L2 Vlan tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD} | | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD} -| Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| Connect interfaces and VLAN sub-interfaces using L2XC | | [Arguments] | ${DUT1} | ${INT1} | ${SUB_INT1} | | ... | ${DUT2} | ${INT2} | ${SUB_INT2} | | [Documentation] | *Add interface and subinterface to bidirectional @@ -124,10 +124,10 @@ | | ... | - INT2 - Interface to add to the cross-connect. | | ... | - SUB_INT2 - Sub-interface to add to the cross-connect. | | ... -| | L2 setup xconnect on DUT | ${DUT1} | ${INT1} | ${SUB_INT1} -| | L2 setup xconnect on DUT | ${DUT2} | ${INT2} | ${SUB_INT2} +| | Configure L2XC | ${DUT1} | ${INT1} | ${SUB_INT1} +| | Configure L2XC | ${DUT2} | ${INT2} | ${SUB_INT2} -| Vlan Subinterface Created +| Create vlan sub-interface | | [Documentation] | Create VLAN sub-interface on DUT and set admin status up. | | ... | | ... | *Arguments:* @@ -141,7 +141,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Vlan Subinterface Created \| ${nodes['DUT1']} \| port3 \| 100 \| +| | ... | \| Create vlan sub-interface \| ${nodes['DUT1']} \| port3 \| 100 \| | | ... | | [Arguments] | ${dut_node} | ${interface} | ${vlan_id} | | [Return] | ${vlan_name} | ${vlan_index} @@ -150,7 +150,7 @@ | | ... | ${dut_node} | ${interface_name} | ${vlan_id} | | Set Interface State | ${dut_node} | ${vlan_index} | up -| Tagged Subinterface Created +| Create tagged sub-interface | | [Documentation] | Create tagged sub-interface on DUT. Type of tagged \ | | ... | sub-intreface depends on type_subif value: | | ... | - one_tag -> VLAN @@ -171,7 +171,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Tagged Subinterface Created \| ${nodes['DUT1']} \| port1 \| 10 \ +| | ... | \| Create tagged sub-interface \| ${nodes['DUT1']} \| port1 \| 10 \ | | ... | \| outer_vlan_id=100 \| inner_vlan_id=200 \ | | ... | \| type_subif=two_tags dot1ad \| | | ... @@ -185,7 +185,7 @@ | | ... | outer_vlan_id=${outer_vlan_id} | inner_vlan_id=${inner_vlan_id} | | ... | type_subif=${type_subif} -| L2 Tag Rewrite Method Is Set On Interface +| Configure L2 tag rewrite method on interface | | [Documentation] | Set L2 tag rewrite on (sub-)interface on DUT | | ... | | ... | *Arguments:* @@ -204,9 +204,9 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT1']} \ +| | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT1']} \ | | ... | \| 9 \| pop-1 \| -| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT2']} \ +| | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT2']} \ | | ... | \| 10 \| translate-1-2 \| push_dot1q=${False} \| tag1_id=10 \ | | ... | \| tag1_id=20 \| | | ... diff --git a/resources/libraries/robot/testing_path.robot b/resources/libraries/robot/testing_path.robot index e31ebd5214..b7543e1c4d 100644 --- a/resources/libraries/robot/testing_path.robot +++ b/resources/libraries/robot/testing_path.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.NodePath *** Keywords *** -| Path for 2-node testing is set +| Configure path in 2-node circular topology | | [Documentation] | Compute path for testing on two given nodes in circular | | ... | topology and set corresponding test case variables. | | ... @@ -43,7 +43,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 2-node testing is set \| ${nodes['TG']} \ +| | ... | \| Given Configure path in 2-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \| | | ... | | [Arguments] | ${tg_node} | ${dut_node} | ${tg2_node} @@ -69,7 +69,7 @@ | | Set Test Variable | ${tg_node} | | Set Test Variable | ${dut_node} -| Interfaces in 2-node path are up +| Set interfaces in 2-node circular topology up | | [Documentation] | Set UP state on interfaces in 2-node path on nodes and | | ... | wait for all interfaces are ready. Requires more than | | ... | one link between nodes. @@ -81,13 +81,13 @@ | | ... | - No value returned. | | ... | | ... | _NOTE:_ This KW uses test variables sets in -| | ... | "Path for 2-node testing is set" KW. +| | ... | "Configure path in 2-node circular topology" KW. | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 2-node testing is set \| ${nodes['TG']} \ +| | ... | \| Given Configure path in 2-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \| -| | ... | \| And Interfaces in 2-node path are up \| +| | ... | \| And Set interfaces in 2-node circular topology up \| | | ... | | Set Interface State | ${tg_node} | ${tg_to_dut_if1} | up | | Set Interface State | ${tg_node} | ${tg_to_dut_if2} | up @@ -95,7 +95,7 @@ | | Set Interface State | ${dut_node} | ${dut_to_tg_if2} | up | | Vpp Node Interfaces Ready Wait | ${dut_node} -| Path for 3-node testing is set +| Configure path in 3-node circular topology | | [Documentation] | Compute path for testing on three given nodes in circular | | ... | topology and set corresponding test case variables. | | ... @@ -128,7 +128,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 3-node testing is set \| ${nodes['TG']} \ +| | ... | \| Given Configure path in 3-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| ${nodes['TG']} \| | | ... | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg2_node} @@ -163,7 +163,7 @@ | | Set Test Variable | ${dut1_node} | | Set Test Variable | ${dut2_node} -| Interfaces in 3-node path are up +| Set interfaces in 3-node circular topology up | | [Documentation] | | ... | Set UP state on interfaces in 3-node path on nodes and \ | | ... | wait until all interfaces are ready. @@ -175,13 +175,13 @@ | | ... | - No value returned. | | ... | | ... | _NOTE:_ This KW uses test variables sets in -| | ... | "Path for 3-node testing is set" KW. +| | ... | "Configure path in 3-node circular topology" KW. | | ... | | ... | *Example:* | | ... -| | ... | \| Given Path for 3-node testing is set \| ${nodes['TG']} \ +| | ... | \| Given Configure path in 3-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \| -| | ... | \| And Interfaces in 3-node path are up \| +| | ... | \| And Set interfaces in 3-node circular topology up \| | | ... | | Set Interface State | ${tg_node} | ${tg_to_dut1} | up | | Set Interface State | ${tg_node} | ${tg_to_dut2} | up @@ -192,7 +192,7 @@ | | Vpp Node Interfaces Ready Wait | ${dut1_node} | | Vpp Node Interfaces Ready Wait | ${dut2_node} -| Path for Double-Link 3-node testing is set +| Configure path in double-link 3-node circular topology | | [Documentation] | | ... | Compute path for testing on three given nodes in circular \ | | ... | topology with double link and set corresponding \ @@ -239,7 +239,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \ +| | ... | \| Configure path in double-link 3-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| ${nodes['TG']} \| | | ... | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg2_node} @@ -317,7 +317,7 @@ | | Set Test Variable | ${dut2_to_dut1_if1_mac} | | Set Test Variable | ${dut2_to_dut1_if2_mac} -| Interfaces in Double-Link 3-node path are UP +| Set interfaces in double-link 3-node circular topology up | | [Documentation] | | ... | Set UP state on interfaces in 3-node double link path \ | | ... | wait until all interfaces are ready. @@ -329,11 +329,11 @@ | | ... | - No value returned. | | ... | | ... | _NOTE:_ This KW uses test variables sets in -| | ... | "Path for Double-Link 3-node testing is set" KW. +| | ... | "Configure path in double-link 3-node circular topology" KW. | | ... | | ... | *Example:* | | ... -| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \ +| | ... | \| Configure path in double-link 3-node circular topology \| ${nodes['TG']} \ | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \| | | ... | \| Interfaces in Double-Link 3-node testing are UP \| | | ... diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/traffic.robot index 18db071e01..d39784666f 100644 --- a/resources/libraries/robot/traffic.robot +++ b/resources/libraries/robot/traffic.robot @@ -26,7 +26,7 @@ | Documentation | Traffic keywords *** Keywords *** -| Send Packet And Check Headers +| Send packet and verify headers | | [Documentation] | Sends packet from IP (with source mac) to IP | | ... | (with dest mac). There has to be 4 MAC addresses | | ... | when using 2 node + @@ -62,7 +62,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send Packet And Check Headers \| ${nodes['TG']} \| 10.0.0.1 \ +| | ... | \| Send packet and verify headers \| ${nodes['TG']} \| 10.0.0.1 \ | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \ | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \| | | ... @@ -94,7 +94,7 @@ | | Run Traffic Script On Node | send_icmp_check_headers.py | ${tg_node} | | | ... | ${args} -| Send packet from Port to Port should failed +| Packet transmission from port to port should fail | | [Documentation] | Sends packet from ip (with specified mac) to ip | | ... | (with dest mac). Using keyword : Send packet And Check | | ... | Headers and subsequently checks the return value @@ -119,7 +119,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send packet from Port to Port should failed \| ${nodes['TG']} \ +| | ... | \| Packet transmission from port to port should fail \| ${nodes['TG']} \ | | ... | \| 10.0.0.1 \ \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \ | | ... | \| 08:00:27:a2:52:5b \| eth3 \| 08:00:27:4d:ca:7a \ | | ... | \| 08:00:27:7d:fd:10 \| @@ -136,7 +136,7 @@ | | ... | Run Traffic Script On Node | send_icmp_check_headers.py | | ... | ${tg_node} | ${args} -| Send Packet And Check ARP Request +| Send packet and verify ARP request | | [Documentation] | Send IP packet from tx_port and check if ARP Request\ | | ... | packet is received on rx_port. | | ... @@ -183,7 +183,7 @@ | | ... | --rx_arp_src_ip ${rx_arp_src_ip} | --rx_arp_dst_ip ${rx_arp_dst_ip} | | Run Traffic Script On Node | send_icmp_check_arp.py | ${tg_node} | ${args} -| Send TCP or UDP packet +| Send TCP or UDP packet and verify received packet | | [Documentation] | Sends TCP or UDP packet with specified source | | ... | and destination port. | | ... @@ -208,7 +208,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send TCP or UDP packet \| ${nodes['TG']} \ +| | ... | \| Send TCP or UDP packet and verify received packet \| ${nodes['TG']} \ | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \ | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| TCP \| 20 \| 80 \| | | ... @@ -229,7 +229,7 @@ | | Run Traffic Script On Node | send_tcp_udp.py | | ... | ${tg_node} | ${args} -| Send TCP or UDP packet should failed +| TCP or UDP packet transmission should fail | | [Documentation] | Sends TCP or UDP packet with specified source | | ... | and destination port. | | ... @@ -254,7 +254,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send TCP or UDP packet should failed \| ${nodes['TG']} \ +| | ... | \| TCP or UDP packet transmission should fail \| ${nodes['TG']} \ | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \ | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| TCP \| 20 \| 80 \| | | ... @@ -276,7 +276,7 @@ | | ... | Run Traffic Script On Node | send_tcp_udp.py | | ... | ${tg_node} | ${args} -| Receive And Check Router Advertisement Packet +| Receive and verify router advertisement packet | | [Documentation] | Wait until RA packet is received and then verify\ | | ... | specific fields of received RA packet. | | ... @@ -293,7 +293,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Receive And Check Router Advertisement Packet \ +| | ... | \| Receive and verify router advertisement packet \ | | ... | \| ${nodes['DUT1']} \| eth2 \| 08:00:27:cc:4f:54 \| | | ... | | [Arguments] | ${node} | ${rx_port} | ${src_mac} | ${interval}=${0} @@ -304,7 +304,7 @@ | | ... | --interval ${interval} | | Run Traffic Script On Node | check_ra_packet.py | ${node} | ${args} -| Send Router Solicitation and check response +| Send router solicitation and verify response | | [Documentation] | Send RS packet, wait for response and then verify\ | | ... | specific fields of received RA packet. | | ... @@ -322,7 +322,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send Router Solicitation and check response \ +| | ... | \| Send router solicitation and verify response \ | | ... | \| ${nodes['TG']} \| ${nodes['DUT1']} \| eth2 \ | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| | | ... @@ -376,7 +376,7 @@ | | ... | --src_ip | ${src_ip} | --dst_ip | ${tgt_ip} | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args} -| Send ARP Request should failed +| ARP request should fail | | [Documentation] | Send ARP Request and | | ... | the ARP Response should not be received. | | ... @@ -402,7 +402,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send ARP Request should failed \| ${nodes['TG']} \| eth3 \ +| | ... | \| ARP request should fail \| ${nodes['TG']} \| eth3 \ | | ... | \| 08:00:27:cc:4f:54 \| 08:00:27:c9:6a:d5 \ | | ... | \| 10.0.0.100 \| 192.168.1.5 \| | | ... @@ -415,7 +415,7 @@ | | Run Keyword And Expect Error | ARP reply timeout | | ... | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args} -| Send Packets And Check Multipath Routing +| Send packets and verify multipath routing | | [Documentation] | Send 100 IP ICMP packets traffic and check if it is\ | | ... | divided into two paths. | | ... diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot index 36a31584d0..27c9c7c3da 100644 --- a/resources/libraries/robot/vxlan.robot +++ b/resources/libraries/robot/vxlan.robot @@ -25,7 +25,7 @@ | Library | resources.libraries.python.NodePath *** Keywords *** -| IP addresses are set on interfaces +| Configure IP addresses and neighbors on interfaces | | [Documentation] | *Set IPv4 addresses on interfaces on DUTs.* | | ... | If interface index is None then is determines with Get Interface Sw Index | | ... | in this case it is required the interface to be present in topology dict. @@ -64,15 +64,15 @@ | | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} | | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} -| Interfaces are added to BD +| Add interfaces to L2BD | | [Arguments] | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} | | Vpp Add L2 Bridge Domain | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2} -| Interfaces are added to xconnect +| Add interfaces to L2XC | | [Arguments] | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2} -| | L2 setup xconnect on DUT | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2} +| | Configure L2XC | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2} -| Vlan interfaces for VXLAN are created +| Create vlan interfaces for VXLAN | | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given VLAN ID.* | | ... | | ... | _Set testcase variables with name and index of created interfaces:_ @@ -95,7 +95,7 @@ | | Set Test Variable | ${dut2s_vlan_name} | | Set Test Variable | ${dut2s_vlan_index} -| Send VXLAN receive VXLAN Packet +| Send VXLAN encapsulated packet and verify received packet | | [Documentation] | Send VXLAN encapsulated Ethernet frame and check \ | | ... | received one. | | ... @@ -119,7 +119,7 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Send VXLAN receive VXLAN Packet \| ${tg_node} \| port4 \| port4 \ +| | ... | \| Send VXLAN encapsulated packet and verify received packet \| ${tg_node} \| port4 \| port4 \ | | ... | \| fa:16:3e:6d:f9:c5 \| fa:16:3e:e6:6d:9a \| 192.168.0.1 \ | | ... | \| 192.168.0.2 \| ${101} \| 192.168.0.2 \| 192.168.0.1 \| ${102} \| | | ... diff --git a/resources/tools/rename_robot_keywords.py b/resources/tools/rename_robot_keywords.py new file mode 100755 index 0000000000..9f27b4aaec --- /dev/null +++ b/resources/tools/rename_robot_keywords.py @@ -0,0 +1,243 @@ +#!/usr/bin/python + +# Copyright (c) 2017 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: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""This script renames the given robot keywords in the given directory +recursively. + +Example: + + ./rename_robot_keywords.py -i kws.csv -s ";" -d ~/ws/vpp/git/csit/ -vvv + + Input file "kws.csv" is CSV file exported from e.g. MS Excel. Its structure + must be: + + <Old keyword name><separator><New keyword name> + + One keyword per line. + +""" + +import argparse +import sys +import re +from os import walk, rename +from os.path import join + + +def time_interval(func): + """Decorator function to measure the time spent by the decorated function. + + :param func: Decorated function. + :type func: Callable object. + :returns: Wrapper function. + :rtype: Callable object. + """ + + import time + + def wrapper(*args, **kwargs): + start = time.clock() + result = func(*args, **kwargs) + stop = time.clock() + print("\nRenaming done in {:.5g} seconds\n". + format(stop - start)) + return result + return wrapper + + +def get_files(path, extension): + """Generates the list of files to process. + + :param path: Path to files. + :param extension: Extension of files to process. If it is the empty string, + all files will be processed. + :type path: str + :type extension: str + :returns: List of files to process. + :rtype: list + """ + + file_list = list() + for root, dirs, files in walk(path): + for filename in files: + if extension: + if filename.endswith(extension): + file_list.append(join(root, filename)) + else: + file_list.append(join(root, filename)) + + return file_list + + +def read_keywords(args): + """This function reads the keywords from the input file and creates: + + - a dictionary where the key is the old name and the value is the new name, + these keywords will be further processed. + - a list of keywords which will not be processed, typically keywords with + argument(s) in its names. + - a list of duplicates - duplicated keyword names or names which are parts + of another keyword name, they will not be processed. + + :param args: Parsed arguments. + :type args: ArgumentParser + :returns: keyword names - dictionary where the key is the old name and the + value is the new name; ignored keyword names - list of keywords which will + not be processed; duplicates - duplicated keyword names or names which are + parts of another keyword name, they will not be processed. + :rtype: tuple(dict, list, list) + """ + + kw_names = dict() + ignored_kw_names = list() + duplicates = list() + + for line in args.input: + old_name, new_name = line.split(args.separator) + if '$' in old_name: + ignored_kw_names.append((old_name, new_name[:-1])) + elif old_name in kw_names.keys(): + duplicates.append((old_name, new_name[:-1])) + else: + kw_names[old_name] = new_name[:-1] + + # Remove duplicates: + for old_name, _ in duplicates: + new_name = kw_names.pop(old_name, None) + if new_name: + duplicates.append((old_name, new_name)) + + # Find KW names which are parts of other KW names: + for old_name in kw_names.keys(): + count = 0 + for key in kw_names.keys(): + if old_name in key: + count += 1 + if old_name in kw_names[key]: + if old_name != key: + count += 1 + if count > 1: + duplicates.append((old_name, kw_names[old_name])) + kw_names.pop(old_name) + + return kw_names, ignored_kw_names, duplicates + + +def rename_keywords(file_list, kw_names, args): + """Rename the keywords in specified files. + + :param file_list: List of files to be processed. + :param kw_names: Dictionary where the key is the old name and the value is + the new name + :type file_list: list + :type kw_names: dict + """ + + kw_not_found = list() + + for old_name, new_name in kw_names.items(): + kw_found = False + if args.verbosity > 0: + print("\nFrom: {}\n To: {}\n".format(old_name, new_name)) + for file_name in file_list: + tmp_file_name = file_name + ".new" + with open(file_name) as file_read: + file_write = open(tmp_file_name, 'w') + occurrences = 0 + for line in file_read: + new_line = re.sub(old_name, new_name, line) + file_write.write(new_line) + if new_line != line: + occurrences += 1 + if occurrences: + kw_found = True + if args.verbosity > 1: + print(" {:3d}: {}".format(occurrences, file_name)) + file_write.close() + rename(tmp_file_name, file_name) + if not kw_found: + kw_not_found.append(old_name) + + if args.verbosity > 0: + print("\nKeywords not found:") + for item in kw_not_found: + print(" {}".format(item)) + + +def parse_args(): + """Parse arguments from command line. + + :returns: Parsed arguments. + :rtype: ArgumentParser + """ + + parser = argparse.ArgumentParser(description=__doc__, + formatter_class=argparse. + RawDescriptionHelpFormatter) + parser.add_argument("-i", "--input", + required=True, + type=argparse.FileType('r'), + help="Text file with the old keyword name and the new " + "keyword name separated by separator per line.") + parser.add_argument("-s", "--separator", + default=";", + type=str, + help="Separator which separates the old and the new " + "keyword name.") + parser.add_argument("-d", "--dir", + required=True, + type=str, + help="Directory with robot files where the keywords " + "should be recursively searched.") + parser.add_argument("-v", "--verbosity", action="count", + help="Set the output verbosity.") + return parser.parse_args() + + +@time_interval +def main(): + """Main function.""" + + args = parse_args() + + kw_names, ignored_kw_names, duplicates = read_keywords(args) + + file_list = get_files(args.dir, "robot") + + if args.verbosity > 2: + print("\nList of files to be processed:") + for item in file_list: + print(" {}".format(item)) + print("\n{} files to be processed.\n".format(len(file_list))) + + print("\nList of keywords to be renamed:") + for item in kw_names: + print(" {}".format(item)) + print("\n{} keywords to be renamed.\n".format(len(kw_names))) + + rename_keywords(file_list, kw_names, args) + + if args.verbosity >= 0: + print("\nIgnored keywords: ({})".format(len(ignored_kw_names))) + for old, new in ignored_kw_names: + print(" From: {}\n To: {}\n".format(old, new)) + + print("\nIgnored duplicates ({}):".format(len(duplicates))) + for old, new in duplicates: + print(" From: {}\n To: {}\n".format(old, new)) + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/sample_tests/sample_suite.robot b/sample_tests/sample_suite.robot index 4f7a1402d5..9d44eaf8cd 100644 --- a/sample_tests/sample_suite.robot +++ b/sample_tests/sample_suite.robot @@ -22,7 +22,7 @@ | Resource | resources/libraries/robot/counters.robot | Suite Setup | Run Keywords | Setup Framework | ${nodes} | ... | AND | Setup All DUTs | ${nodes} -| ... | AND | Setup all TGs before traffic script +| ... | AND | Configure all TGs for traffic script | ... | AND | Update All Interface Data On All Nodes | ${nodes} | ... | AND | Setup nodes for macswap testing | Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot index 37e55c0666..3230dabfae 100644 --- a/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot +++ b/tests/func/cop/eth2p-ethip4-ip4base-copblklistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv4 Blacklist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,10 +66,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to | | ... | DUT1; verify no ICMPv4 Echo Req pkts are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -86,7 +86,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot index eb8be688d9..c46a8c9c27 100644 --- a/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot +++ b/tests/func/cop/eth2p-ethip4-ip4base-copwhlistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv4NodeAddress.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv4 Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -66,10 +66,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv4 Echo Req on its interface to | | ... | DUT1; verify received ICMPv4 Echo Req pkts are correct. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -86,7 +86,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot index 7511dfe31b..d0a395cf44 100644 --- a/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot +++ b/tests/func/cop/eth2p-ethip6-ip6base-copblklistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv6 Blacklist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,10 +70,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to | | ... | DUT1; verify no ICMPv6 Echo Req pkts are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -95,7 +95,7 @@ | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot index f75f4d0dea..3fb80ba308 100644 --- a/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot +++ b/tests/func/cop/eth2p-ethip6-ip6base-copwhlistbase-func.robot @@ -22,8 +22,8 @@ | Resource | resources/libraries/robot/l2_xconnect.robot | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *COP Security IPv6 Whitelist Tests* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,10 +70,10 @@ | | ... | src-addr matching packets generated by TG; on DUT2 configure L2 | | ... | xconnect. [Ver] Make TG send ICMPv6 Echo Req on its interface to | | ... | DUT1; verify received ICMPv6 Echo Req pkts are correct. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg_node} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And VPP Set IF IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_if1_ip} | ${ip_prefix} @@ -95,7 +95,7 @@ | | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 | | | ... | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${tg_to_dut2_mac} diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot index 5730e0e6b8..cf7b40bef7 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpclient-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv4 Client related test cases* *** Variables *** @@ -33,84 +33,85 @@ *** Test Cases *** | TC01: VPP sends a DHCP DISCOVER | | [Documentation] | Configure DHCPv4 client on interface to TG without -| | ... | hostname and check if DHCPv4 DISCOVER message contains all -| | ... | required fields with expected values. +| | ... | hostname and check if DHCPv4 DISCOVER message contains all +| | ... | required fields with expected values. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Check DHCP DISCOVER header | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Verify DHCP DISCOVER header | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | TC02: VPP sends a DHCPv4 DISCOVER with hostname | | [Documentation] | Configure DHCPv4 client on interface to TG with hostname -| | ... | and check if DHCPv4 DISCOVER message contains all required -| | ... | fields with expected values. +| | ... | and check if DHCPv4 DISCOVER message contains all required +| | ... | fields with expected values. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | ... | ${client_hostname} -| | Then Check DHCP DISCOVER header | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | ... | ${client_hostname} +| | Then Verify DHCP DISCOVER header | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${client_hostname} | TC03: VPP sends DHCPv4 REQUEST after OFFER | | [Documentation] | Configure DHCPv4 client on interface to TG and check if -| | ... | DHCPv4 REQUEST message contains all required fields. +| | ... | DHCPv4 REQUEST message contains all required fields. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} | TC04: VPP doesn't send DHCPv4 REQUEST after OFFER with wrong XID | | [ Tags ] | EXPECTED_FAILING | | [Documentation] | Configure DHCPv4 client on interface to TG. If server -| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4 -| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent. +| | ... | sends DHCPv4 OFFER with different XID as in DHCPv4 +| | ... | DISCOVER, DHCPv4 REQUEST message shouldn't be sent. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout -| | ... | Check DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} -| | ... | offer_xid=${own_xid} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | Then Run Keyword And Expect Error | DHCP REQUEST Rx timeout +| | ... | Verify DHCP REQUEST after OFFER | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${dut_to_tg_if1_mac} | ${client_ip} | ${client_mask} +| | ... | offer_xid=${own_xid} | TC05: VPP honors DHCPv4 lease time | | [Documentation] | Send IP configuration to the VPP client via DHCPv4. -| | ... | Address is checked with ICMP echo request and there should -| | ... | be no reply for echo request when lease has expired. +| | ... | Address is checked with ICMP echo request and there should +| | ... | be no reply for echo request when lease has expired. | | ... -| | Given Path for 2-node testing is set -| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local -| | ... | ${FALSE} | ${NONE} -| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} -| | And Send IP configuration to client via DHCP -| | ... | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${tg_to_dut_if1_mac} | ${server_ip} -| | ... | ${client_ip} | ${client_mask} -| | ... | ${lease_time} -| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip} -| | ... | ${tg_to_dut_if1_mac} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} -| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip} -| | ... | ${server_ip} -| | And Sleep | ${lease_time} -| | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request | ${tg_node} -| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} -| | ... | ${client_ip} | ${server_ip} +| | Given Configure path in 2-node circular topology +| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} +| | And Set interfaces in 2-node circular topology up +| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local +| | ... | ${FALSE} | ${NONE} +| | When Set DHCP client on Interface | ${dut_node} | ${dut_to_tg_if1} +| | And Configure IP on client via DHCP +| | ... | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${tg_to_dut_if1_mac} | ${server_ip} +| | ... | ${client_ip} | ${client_mask} +| | ... | ${lease_time} +| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${server_ip} +| | ... | ${tg_to_dut_if1_mac} +| | Then Send ICMP echo request and verify answer +| | ... | ${tg_node} | ${tg_to_dut_if1} +| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | ${client_ip} +| | ... | ${server_ip} +| | And Sleep | ${lease_time} +| | And Run Keyword And Expect Error | ICMP echo Rx timeout +| | ... | Send ICMP echo request and verify answer | ${tg_node} +| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} +| | ... | ${client_ip} | ${server_ip} diff --git a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot index 531ed88aa5..de7ae2d4b1 100644 --- a/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip4-ip4base-ip4dhcpproxy-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv4.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv4 proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT @@ -50,9 +50,9 @@ | | ... | [Ver] Make TG verify matching DHCPv4 packets between client and DHCPv4 | | ... | server through DHCP proxy. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local | | ... | ${FALSE} | ${NONE} | | And Set Interface Address | ${dut_node} @@ -63,7 +63,7 @@ | | ... | ${tg_to_dut_if2_mac} | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip} | | ... | ${dut_to_tg_if1_ip} -| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dhcp_server_ip} | ${tg_to_dut_if2_mac} | ${client_ip} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip} @@ -74,9 +74,9 @@ | | ... | [Cfg] On DUT setup DHCPv4 proxy. | | ... | [Ver] Make TG verify matching invalid DHCPv4 packets are dropped. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | ${NONE} | local | | ... | ${FALSE} | ${NONE} | | And Set Interface Address | ${dut_node} @@ -87,7 +87,7 @@ | | ... | ${tg_to_dut_if2_mac} | | When DHCP Proxy Config | ${dut_node} | ${dhcp_server_ip} | | ... | ${dut_to_tg_if1_ip} -| | Then Send DHCP DISCOVER | ${tg_node} | ${tg_to_dut_if1} +| | Then Send DHCP DISCOVER and check answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${valid_discover_dst_ip} -| | And Send DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1} +| | And DHCP DISCOVER should fail | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${discover_src_ip} | ${invalid_discover_dst_ip} diff --git a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot index 6fede3e41c..88f0fbdcb5 100644 --- a/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot +++ b/tests/func/dhcp/eth2p-ethip6-ip6base-ip6dhcpproxy-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/ipv6.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *DHCPv6 proxy test cases* | ... | ... | *[Top] Network Topologies:* TG = DUT @@ -47,9 +47,9 @@ | | ... | DHCPv6 server through DHCPv6 proxy. | | ... | [Ref] RFC 3315 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut_node} diff --git a/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot b/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot index bc6f58c698..9656a4a6f7 100644 --- a/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot +++ b/tests/func/fds/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot @@ -20,17 +20,17 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH -| Test Setup | Run Keywords | Setup all DUTs before test +| Test Setup | Run Keywords | Configure all DUTs before test | ... | AND | Save VPP PIDs -| ... | AND | Setup all TGs before traffic script +| ... | AND | Configure all TGs for traffic script | ... | AND | Reset VAT History On All DUTs | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} -| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | AND | Tear down QEMU | ${dut1_node} | ${qemu_node1} | ... | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | AND | Tear down QEMU | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | Documentation | *Provider network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG @@ -80,7 +80,7 @@ | | ... | a) test l2 connectivity inside every network | | ... | b) test l2 connectivity between networks | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 3-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 3-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if_ip} | | ... | ${prefix_length} @@ -108,7 +108,7 @@ | | ... | ${dut2_node} | ${sock4} | | ${dut2_vhosts}= | And Create List | ${vhost_if1_DUT2} | ${vhost_if2_DUT2} | | ... | ${vhost_if3_DUT2} | ${vhost_if4_DUT2} -| | When Setup QEMU Vhost and Run | ${dut1_node} +| | When Configure QEMU vhost and run it | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -120,7 +120,7 @@ | | ... | ${prefix_length} | | ... | qemu_node1 | | ... | 04 -| | And Setup QEMU Vhost and Run | ${dut2_node} +| | And Configure QEMU vhost and run it | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -163,8 +163,8 @@ | | ... | \| @{vhosts} \| | | ... | | [Arguments] | ${dut_node} | ${interface} | @{vhosts} -| | Bridge domain on DUT node is created | ${dut_node} | ${bid_b} | learn=${TRUE} -| | Bridge domain on DUT node is created | ${dut_node} | ${bid_r} | learn=${TRUE} +| | Create bridge domain | ${dut_node} | ${bid_b} | learn=${TRUE} +| | Create bridge domain | ${dut_node} | ${bid_r} | learn=${TRUE} | | ${interface_name}= | Get interface name | ${dut_node} | ${interface} | | ${vlan1_name} | ${vlan1_index}= | Create Vlan Subinterface | | ... | ${dut_node} | ${interface_name} | ${vlan_blue} @@ -178,17 +178,17 @@ | | ... | tag1_id=${vlan_red} | | L2 Vlan Tag Rewrite | ${dut_node} | @{vhosts}[3] | push-1 | | ... | tag1_id=${vlan_red} -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | ${vlan1_index} | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[0] | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[1] | ${bid_b} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | ${vlan2_index} | ${bid_r} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[2] | ${bid_r} | 0 -| | Interface is added to bridge domain | ${dut_node} +| | Add interface to bridge domain | ${dut_node} | | ... | @{vhosts}[3] | ${bid_r} | 0 | Positive Scenario Ping From DUT1 - Intra network diff --git a/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot b/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot index fae1b0340e..80312fb3f5 100644 --- a/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot +++ b/tests/func/fds/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot @@ -20,17 +20,17 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH -| Test Setup | Run Keywords | Setup all DUTs before test +| Test Setup | Run Keywords | Configure all DUTs before test | ... | AND | Save VPP PIDs -| ... | AND | Setup all TGs before traffic script +| ... | AND | Configure all TGs for traffic script | ... | AND | Reset VAT History On All DUTs | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} -| ... | AND | Qemu Teardown | ${dut1_node} | ${qemu_node1} +| ... | AND | Tear down QEMU | ${dut1_node} | ${qemu_node1} | ... | qemu_node1 -| ... | AND | Qemu Teardown | ${dut2_node} | ${qemu_node2} +| ... | AND | Tear down QEMU | ${dut2_node} | ${qemu_node2} | ... | qemu_node2 -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | Documentation | *Tenant network FDS related.* | ... | ... | Test suite uses 3-node topology TG - DUT1 - DUT2 - TG @@ -80,7 +80,7 @@ | | ... | a) test l2 connectivity inside every network | | ... | b) test l2 connectivity between networks | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set Interface Address | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if_ip} | ${prefix_length} @@ -108,7 +108,7 @@ | | ... | ${dut2_node} | ${sock4} | | ${dut2_vhosts}= | And Create List | ${vhost_if1_DUT2} | ${vhost_if2_DUT2} | | ... | ${vhost_if3_DUT2} | ${vhost_if4_DUT2} -| | When Setup QEMU Vhost and Run | ${dut1_node} +| | When Configure QEMU vhost and run it | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -120,7 +120,7 @@ | | ... | ${prefix_length} | | ... | qemu_node1 | | ... | 04 -| | And Setup QEMU Vhost and Run | ${dut2_node} +| | And Configure QEMU vhost and run it | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${sock3} @@ -162,25 +162,25 @@ | | ... | \| @{vhosts} \| | | ... | | [Arguments] | ${dut_node} | ${src_ip} | ${dst_ip} | @{vhosts} -| | Bridge domain on DUT node is created +| | Create bridge domain | | ... | ${dut_node} | ${bid_b} | learn=${TRUE} -| | Bridge domain on DUT node is created +| | Create bridge domain | | ... | ${dut_node} | ${bid_r} | learn=${TRUE} | | ${vxlan1_if}= | Create VXLAN interface | ${dut_node} | ${vni_blue} | | | ... | ${src_ip} | ${dst_ip} | | ${vxlan2_if}= | Create VXLAN interface | ${dut_node} | ${vni_red} | | | ... | ${src_ip} | ${dst_ip} -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | ${vxlan1_if} | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[0] | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[1] | ${bid_b} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | ${vxlan2_if} | ${bid_r} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[2] | ${bid_r} | 0 -| | Interface is added to bridge domain +| | Add interface to bridge domain | | ... | ${dut_node} | @{vhosts}[3] | ${bid_r} | 0 | Positive Scenario Ping From DUT1 - Intra network diff --git a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot index 2a8b5df299..3959e0954f 100644 --- a/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot +++ b/tests/func/gre/eth2p-ethip4gre-ip4base-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *GREoIPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -72,10 +72,10 @@ | | ... | both DUTs and GRE tunnel between them; verify IPv4 headers on | | ... | received packets are correct. [Ref] RFC2784. | | [Tags] | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 3-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut1_node} | ${dut1_to_tg} | ${net1_gw_address} | ${prefix} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix} @@ -85,17 +85,17 @@ | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${net2_host_address} | | ... | ${tg_to_dut2_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address} | | ${dut2_gre_interface} | ${dut2_gre_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix} | | ... | ${dut2_gre_ip} | ${dut1_gre_index} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${net1_host_address} | ${net2_host_address} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} @@ -108,18 +108,18 @@ | | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received | | ... | GREoIPv4 encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address} | | ... | ${tg_to_dut_if2_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} | | ... | ${dut2_gre_ip} | ${dut1_gre_index} @@ -137,18 +137,18 @@ | | ... | encapsulated into GREoIPv4 towards VPP; verify TG received IPv4 | | ... | de-encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${net1_host_address} | | ... | ${tg_to_dut_if1_mac} | | ${dut1_gre_interface} | ${dut1_gre_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix} | | Then Send GRE and check received ICMPv4 header | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} @@ -167,12 +167,12 @@ | | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received GREoIPv4 | | ... | encapsulated packet is correct for each tunnel. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -183,12 +183,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} @@ -218,12 +218,12 @@ | | ... | configured tunnel same as destination; verify TG received GREoIPv4 | | ... | encapsulated packet is correct. [Ref] RFC2784. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -234,12 +234,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix} @@ -267,12 +267,12 @@ | | ... | destination address. [Ref] RFC2784. | | ... | | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node} | | And Set Interface State | ${dut_node} | ${dut1_lo_index} | up -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix} | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix} | | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32} @@ -285,12 +285,12 @@ | | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32} | | ... | ${dut2_ip_address} | ${dut_to_tg_if2} | | ${dut1_gre0_interface} | ${dut1_gre0_index}= -| | ... | When GRE tunnel interface is created and up +| | ... | When Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst} | | ${dut1_gre1_interface} | ${dut1_gre1_index}= -| | ... | And GRE tunnel interface is created and up +| | ... | And Create GRE tunnel interface and set it up | | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix} | | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix} | | Then Send GRE and check received ICMPv4 header diff --git a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot index 7792fb3fdd..9d94d3d024 100644 --- a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot @@ -119,21 +119,21 @@ | | ... | ${node} | ${table_index} | ${session_index} | ${vat_acl_session} | | When Honeycomb enables ACL on interface | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | Then Interface ACL settings from Honeycomb should be +| | Then Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | TC08: Honeycomb disables ACL on interface | | [Documentation] | Check if Honeycomb API can disable ACL on an interface. -| | Given Interface ACL settings from Honeycomb should be +| | Given Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | | When Honeycomb disables ACL on interface | ${node} | ${interface} -| | Then Interface ACL settings from Honeycomb should be empty +| | Then Interface ACL configuration from Honeycomb should be empty | | ... | ${node} | ${interface} -| | And Interface ACL settings from VAT should be empty +| | And Interface ACL configuration from VAT should be empty | | ... | ${node} | ${interface} | TC09: Honeycomb can remove one out of multiple ACL tables diff --git a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot index ba39c02402..5b6656958d 100644 --- a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot @@ -45,7 +45,7 @@ | | Then DHCP relay configuration from Honeycomb should contain | | ... | ${node} | ${relay1_oper} | | When DHCP relay test setup -| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dhcp_server1_ip} | ${tg_to_dut_if2_mac} | ${client_ip} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip} @@ -88,13 +88,13 @@ *** Keywords *** | DHCP relay test setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | Add ARP on DUT | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server1_ip} | ${tg_to_dut_if2_mac} @@ -104,14 +104,14 @@ | | ... | ${FALSE} | ${NONE} | DHCP relay test setup IPv6 -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip6} | ${prefix_length_v6} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip6} | ${prefix_length_v6} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip6} | | ... | ${tg_to_dut_if2_mac} diff --git a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot index 4fe9dde40c..c6ae380f9b 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot @@ -34,7 +34,7 @@ | TC01: Honeycomb can create and delete interfaces | | [Documentation] | Repeatedly create and delete an interface through Netconf\ | | ... | and check the reply for any errors. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | And Honeycomb creates first L2 bridge domain | | ... | ${node} | bd_netconf | ${bd_settings} | | :FOR | ${index} | IN RANGE | 20 @@ -44,7 +44,7 @@ | TC02: Transaction revert test case 1 | | [Documentation] | Configure two conflicting VxLAN tunnels, then verify\ | | ... | that neither tunnel exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -53,7 +53,7 @@ | TC03: Transaction revert test case 2 | | [Documentation] | Configure two conflicting TAP interfaces, then verify\ | | ... | that neither interface exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -61,7 +61,7 @@ | TC04: Vlan subinterface creation | | [Documentation] | Configure a Vlan sub-interface under a physical interface. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | When Error Trigger Is Sent | | ... | ${trigger_vlan} | interface=${interface} | | Then Replies should not contain RPC errors diff --git a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot index c7e0737a6b..803cfa0932 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot @@ -36,7 +36,7 @@ | TC01: Honeycomb creates sub-interface | | [Documentation] | Check if Honeycomb creates a sub-interface. | | ... -| | Given Honeycomb sets interface state | ${node} | ${super_if} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -62,7 +62,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | down | down | | Sub-interface state from VAT should be | | ... | ${node} | ${sub_if_name} | down | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | up | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | up @@ -112,7 +112,7 @@ | | ... | ${node} | ${super_if} | up | | And interface state from VAT should be | | ... | ${node} | ${super_if} | up -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | down | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | down @@ -387,7 +387,7 @@ | TC18: Honeycomb modifies sub-interface exact tag match | | [Documentation] | Check if Honeycomb can modify a sub-interface with exact\ | | ... | tag match. -| | Given Honeycomb sets interface state | ${node} | ${super_if2} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if2} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if2} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -466,7 +466,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | | And sub-interface ipv4 address from VAT should be empty | | ... | ${node} | ${sub_if_name} -| | And Honeycomb sets interface ipv4 address | ${node} +| | And Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${super_if}.${sub_if_id} | local0 @@ -485,7 +485,7 @@ | TC23: Honeycomb removes sub-interface unnumbered configuration | | [Documentation] | Check if Honeycomb can remove unnumbered configuration\ | | ... | from a sub-interface. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | local0 | | Given IPv4 address from Honeycomb should be | | ... | ${node} | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} @@ -552,7 +552,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | up | | Honeycomb sets the sub-interface up | | ... | ${node} | ${super_interface} | ${identifier} @@ -572,7 +572,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | down | | Honeycomb sets the sub-interface down | | ... | ${node} | ${super_interface} | ${identifier} diff --git a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot index edc1713824..dd619efbe7 100644 --- a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot @@ -34,11 +34,11 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up | | And Interface state from VAT should be | ${node} | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down @@ -48,7 +48,7 @@ | | ... | with address and netmask provided. | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address | ${node} | ${interface} +| | When Honeycomb sets interface IPv4 address | ${node} | ${interface} | | ... | ${ipv4_address} | ${ipv4_mask} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} @@ -64,18 +64,18 @@ | | And IPv4 address from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address} | | ... | ${ipv4_prefix} | ${ipv4_mask} -| | When Honeycomb removes interface ipv4 addresses | ${node} | ${interface} +| | When Honeycomb removes interface IPv4 addresses | ${node} | ${interface} | | Then IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} | TC04: Honeycomb modifies interface IPv4 address with prefix | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4\ | | ... | with address and prefix provided. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} @@ -85,24 +85,24 @@ | TC05: Honeycomb modifies IPv4 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv4 neighbors +| | [Teardown] | Honeycomb clears all interface IPv4 neighbors | | ... | ${node} | ${interface} | | Given IPv4 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv4 neighbor +| | When Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | | Then IPv4 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | TC06: Honeycomb modifies interface configuration - IPv6 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv6. -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} | | Given IPv6 address from Honeycomb should be empty | | ... | ${node} | ${interface} | | And IPv6 address from VAT should be empty | | ... | ${node} | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} | | Then IPv6 address from Honeycomb should contain | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} @@ -111,11 +111,11 @@ | TC07: Honeycomb modifies IPv6 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv6 neighbors +| | [Teardown] | Honeycomb clears all interface IPv6 neighbors | | ... | ${node} | ${interface} | | Given IPv6 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv6 neighbor +| | When Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} | | Then IPv6 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} @@ -133,13 +133,13 @@ | TC09: Honeycomb modifies interface configuration - vrf | | [Documentation] | Check if Honeycomb API can configure interface\ | | ... | vrf ID. -| | [Teardown] | Honeycomb sets interface vrf ID +| | [Teardown] | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${0} | ipv4 -| | When Honeycomb sets interface vrf ID +| | When Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${1} | ipv4 -| | Then Interface vrf ID from Honeycomb should be +| | Then Interface VRF ID from Honeycomb should be | | ... | ${node} | ${interface} | ${1} | ipv4 -| | And Interface vrf ID from VAT should be +| | And Interface VRF ID from VAT should be | | ... | ${node} | ${interface} | ${1} | TC10: Honeycomb can configure multiple IP addresses on one interface @@ -152,15 +152,15 @@ | | ... | of source and destination IP addresses. Receive an ICMP reply\ | | ... | for every packet sent. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} -| | And Honeycomb adds interface ipv4 address +| | And Honeycomb adds interface IPv4 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address2} | ${ipv4_prefix} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb adds interface ipv6 address +| | And Honeycomb adds interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address2} | ${ipv6_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} @@ -171,16 +171,16 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} | | And IPv6 address from VAT should contain | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor2} | ${neighbor_mac2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor2} | ${neighbor_mac2} -| | And Vpp nodes ra suppress link layer | ${nodes} +| | And Suppress ICMPv6 router advertisement message | ${nodes} | | Then Ping and Verify IP address | ${nodes['TG']} | | ... | ${ipv4_neighbor} | ${ipv4_address} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -201,15 +201,15 @@ | TC11: Honeycomb fails to configure two IPv4 addresses from the same subnet | | [Documentation] | Check if Honeycomb can configure two IPv4 addresses in\ | | ... | the same subnet onto a single interface. It should not be possible. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | 192.168.0.1 | ${9} -| | Then Honeycomb fails to add interface ipv4 address +| | Then Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.168.0.2 | ${9} -| | And Honeycomb fails to add interface ipv4 address +| | And Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.232.0.2 | ${9} | TC12: Honeycomb fails to configure two IPv6 addresses from the same subnet @@ -217,19 +217,19 @@ | | ... | the same subnet onto a single interface. It should not be possible. | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | 10::FF10 | ${64} -| | Then Honeycomb fails to add interface ipv6 address +| | Then Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FF11 | ${64} -| | And Honeycomb fails to add interface ipv6 address +| | And Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FFFF | ${64} | TC13: Honeycomb can configure unnumbered interface | | [Documentation] | Check if Honeycomb can configure an unnumbered interface\ | | ... | on a physical interface, borrowing the IP address of 'local0'. -| | Given Honeycomb sets interface ipv4 address | ${node} +| | Given Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4_address} | ${ipv4_prefix} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${interface} | local0 diff --git a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot index 76683a70db..48527b98df 100644 --- a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot @@ -46,7 +46,7 @@ | | ... | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up @@ -230,5 +230,5 @@ | Set test interface down | | [Documentation] | Set the interface used in tests down. | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${interface} | down diff --git a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot index 174a145a52..9f4a328258 100644 --- a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot @@ -33,16 +33,16 @@ | Force Tags | HC_FUNC *** Test Cases *** -| TC01: Honeycomb enables Lisp feature +| TC01: Honeycomb enables LISP feature | | [Documentation] | Check if Honeycomb can enable the Lisp feature. | | Given Lisp Should Not Be Configured | ${node} -| | When Honeycomb Enables Lisp | ${node} -| | Then Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | When Honeycomb enables LISP | ${node} +| | Then LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | TC02: Honeycomb adds locator set and locator | | [Documentation] | Check if Honeycomb can configure a locator set. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | When Honeycomb adds locator set | ${node} | ${interface} | ${locator_set} | | Then Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} @@ -50,39 +50,39 @@ | TC03: Honeycomb configures Lisp - remote mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with a bridge domain. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_bd} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_bd} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | TC04: Honeycomb can remove Lisp mapping | | [Documentation] | Check if Honeycomb can remove a configured Lisp mapping. -| | Given Lisp mapping From Honeycomb Should Be +| | Given LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | | When Honeycomb removes all lisp mappings | ${node} -| | Then Lisp mappings from Honeycomb should not exist +| | Then LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | TC05: Honeycomb configures Lisp - remote mapping - VRF | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with VRF. | | [Teardown] | Honeycomb removes all lisp mappings | ${node} -| | Given Lisp mappings from Honeycomb should not exist +| | Given LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_vrf} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_vrf} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_remote_vrf} +| | And LISP mapping from VAT should be | ${node} | ${vat_remote_vrf} | TC06: Honeycomb configures Lisp - local mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -90,15 +90,15 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_bd} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_bd_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_bd} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_bd} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_bd_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_bd} | TC07: Honeycomb configures Lisp - local mapping - VRF | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -106,13 +106,13 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_vrf} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_vrf} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_vrf} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_vrf_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_vrf} | TC08: Honeycomb configures Lisp mapping with adjacency | | [Documentation] | Check if Honeycomb can configure local and remote Lisp\ @@ -122,28 +122,28 @@ | | ... | ${node} | ${interface} | ${locator_set} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | And Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_both_vrf} -| | When Honeycomb adds Lisp adjacency | ${node} | ${7} | remote_map_vrf +| | And Honeycomb adds LISP mapping | ${node} | ${lisp_settings_both_vrf} +| | When Honeycomb adds LISP adjacency | ${node} | ${7} | remote_map_vrf | | ... | adj01 | ${vrf_adjacency} | | Then Lisp mapping from Honeycomb should be | | ... | ${node} | ${adj_subtable} | TC09: Honeycomb configures Lisp Map Resolver | | [Documentation] | Check if Honeycomb can configure a Lisp Map Resolver. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Resolver | ${node} | ${ip_address} | | Then Map Resolver from Honeycomb should be | ${node} | ${ip_address} | | And Map Resolver from VAT should be | ${node} | ${ip_address} | TC10: Honeycomb configures Lisp Map Server | | [Documentation] | Check if Honeycomb can configure a Lisp Map Server. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Server | ${node} | @{ip_addresses} | | Then Map Server from Honeycomb should be | ${node} | @{ip_addresses} | | And Map Server from VAT should be | ${node} | @{ip_addresses} @@ -151,24 +151,24 @@ | TC11: Honeycomb configures Lisp PETR configuration | | [Documentation] | Check if Honeycomb can configure Lisp | | ... | PETR configuration. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp PETR feature | ${node} | ${ip_address} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP PETR feature | ${node} | ${ip_address} | | Then PETR configuration from Honeycomb should be | ${node} | ${ip_address} | | And PETR configuration from VAT should be | ${node} | enabled | TC12: Honeycomb configures Lisp RLOC Probing | | [Documentation] | Check if Honeycomb can configure Lisp RLOC Probing. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp RLOC feature | ${node} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP RLOC feature | ${node} | | Then RLOC Probing from Honeycomb should be | ${node} | ${True} | | And RLOC Probing from VAT should be | ${node} | enabled | TC13: Honeycomb configures Lisp Map Register | | [Documentation] | Check if Honeycomb can configure a Lisp Map Register. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Register | ${node} | ${True} | | Then Map Register from Honeycomb should be | ${node} | ${True} | | And Map Register from VAT should be | ${node} | enabled @@ -177,7 +177,7 @@ | | [Documentation] | Check if Honeycomb can configure the Lisp PITR feature. | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | When Honeycomb enables Lisp PITR feature | ${node} | ${locator_set} +| | When Honeycomb enables LISP PITR feature | ${node} | ${locator_set} | | Then PITR config from Honeycomb should be | ${node} | ${locator_set} | | And PITR config from VAT should be | ${node} | ${locator_set} @@ -185,14 +185,14 @@ | | [Documentation] | Check if Honeycomb can disable all Lisp features. | | Given Map resolver from Honeycomb should be | ${node} | ${ip_address} | | And PITR config from Honeycomb should be | ${node} | ${locator_set} -| | When Honeycomb disables all Lisp features | ${node} +| | When Honeycomb disables all LISP features | ${node} | | Then Lisp Should Not Be Configured | ${node} | TC16: Honeycomb configures Lisp Map Request Mode | | [Documentation] | Check if Honeycomb can configure Lisp Map Request mode. | | ... | Note: Map Request Mode cannot be removed once configured. -| | [Teardown] | Honeycomb disables Lisp | ${node} -| | Given Honeycomb Enables Lisp | ${node} +| | [Teardown] | Honeycomb disables LISP | ${node} +| | Given Honeycomb enables LISP | ${node} | | When Honeycomb sets Lisp Map Request Mode | ${node} | ${True} | | Then Map Request Mode from Honeycomb should be | | ... | ${node} | source-destination diff --git a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot index abdd94ceb3..7f96472474 100644 --- a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot @@ -66,17 +66,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_macip} | | ... | ingress | macip=${True} -| | When Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | When Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src2} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} @@ -98,18 +98,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -132,18 +132,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -166,19 +166,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -201,17 +201,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -233,18 +233,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -266,18 +266,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -308,17 +308,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -344,18 +344,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -372,18 +372,18 @@ | | ... | to the other, using different IPv6 IPs. Receive all packets except\ | | ... | those with IPs in the filtered ranges and UDP protocol payload. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | L3_IP6 | ${acl_name_l3_ip6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor +| | And Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} | | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False @@ -393,18 +393,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -427,19 +427,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -462,17 +462,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dst_mac} @@ -495,18 +495,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -523,17 +523,17 @@ | | ... | to the other, using different codes and types. Receive all packets\ | | ... | except those with the filtered type and code. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | icmpv6 | ${acl_name_icmpv6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv6 neighbor +| | And Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length} @@ -544,18 +544,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -595,17 +595,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -616,17 +616,17 @@ | | [Documentation] | Import test variables, set interfaces up, | | ... | configure IPv4 addresses, add neighbor entry and routes. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | VPP Route Add | | ... | ${node} | ${dst_net} | ${prefix_length} | ${gateway} @@ -638,7 +638,7 @@ | Setup interfaces and bridge domain for plugin-acl test | | [Documentation] | Import test variables, set interfaces up and bridge them. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path For 2-node Testing Is Set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} @@ -665,8 +665,8 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Read plugin-ACL configuration from VAT | ${node} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} -| | Honeycomb removes interface ipv4 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv4 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv4 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${dut_to_tg_if1} | Routed ACL test teardown - ipv6 | | [Documentation] | Log packet trace and ACL settings, @@ -674,5 +674,5 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} | | Read plugin-ACL configuration from VAT | ${node} -| | Honeycomb removes interface ipv6 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv6 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv6 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${dut_to_tg_if1} diff --git a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot index 2884f7c628..d9b6aaaa9c 100644 --- a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot @@ -53,7 +53,7 @@ | TC03: Honeycomb can configure Policer with increased values of CIR (900kbps) | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | with increased values of CIR. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_2} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -62,7 +62,7 @@ | TC04: Honeycomb can configure Packets-Per-Second Based Policer | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | based on rate-type measured in pps. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_3} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -78,7 +78,7 @@ | | ... | ${acl_tables['hc_acl_session']['match']} | AND | | ... | Honeycomb removes ACL table | ${node} | | ... | ${acl_tables['hc_acl_table']['name']} | AND -| | ... | Policer test teardown | ${node} +| | ... | Tear down policer test | ${node} | | Given Honeycomb configures Policer | ${node} | ${policer_data} | | And ACL table from Honeycomb should not exist | | ... | ${node} | ${acl_tables['hc_acl_table']['name']} @@ -100,7 +100,7 @@ | | ... | Packet on DUT1 is marked with DSCP tag. Verifies if DUT1 sends\ | | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG. | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Honeycomb configures Policer | ${dut_node} | ${policer_data_3} | | And ACL table from Honeycomb should not exist @@ -112,17 +112,17 @@ | | ... | ${acl_tables['hc_acl_session']} | | And Honeycomb enables policer on interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_tables['hc_acl_table']['name']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_to_dut_if2_ip} | | ... | ${tg_to_dut_if2_mac} | | And interfaceCLI.VPP Node Interfaces Ready Wait | ${dut_node} -| | Then Honeycomb Send Packet and Verify Marking | ${tg_node} +| | Then Honeycomb Send packet and verify marking | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp_number} diff --git a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot index 23ece5ed5e..056771512f 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot @@ -62,16 +62,16 @@ | | [Teardown] | Run Keywords | | ... | Show Packet Trace on all DUTs | ${nodes} | | ... | AND | Honeycomb removes proxyARP configuration | ${node} -| | ... | AND | Honeycomb sets interface state +| | ... | AND | Honeycomb configures interface state | | ... | ${dut_node} | ${dut_to_tg_if1} | down -| | ... | AND | Honeycomb removes interface ipv4 addresses +| | ... | AND | Honeycomb removes interface IPv4 addresses | | ... | ${node} | ${interface} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | ${dut_to_tg_name}= | Get interface name | ${dut_node} | ${dut_to_tg_if1} | | ${tg_to_dut_name}= | Get interface name | ${tg_node} | ${tg_to_dut_if1} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_ip} | ${prefix_length} | | When Honeycomb configures proxyARP | ${dut_node} | ${proxyarp_settings_ipv4} | | And Honeycomb enables proxyARP on interface | ${node} | ${dut_to_tg_name} diff --git a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot index c934b06a84..abc03c04f4 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot @@ -44,7 +44,7 @@ | | [Documentation] | Check if Honeycomb can configure the IPv6 ND proxy\ | | ... | feature on an interface. | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | | Then IPv6 ND proxy from Honeycomb should be @@ -64,7 +64,7 @@ | | [Teardown] | Honeycomb disables IPv6 ND proxy on interface | | ... | ${node} | ${interface} | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | ${test_dst_ip2} | | Then IPv6 ND proxy from Honeycomb should be @@ -85,23 +85,23 @@ | | ... | Show Packet Trace on All DUTs | ${nodes} | AND | | ... | Honeycomb disables IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if1} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${test_src_ip} | ${tg_to_dut_if1_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${test_dst_ip} | ${tg_to_dut_if2_mac} | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${test_dst_ip} -| | Then Verify IPv6ND Proxy | ${tg_node} +| | Then Verify IPv6ND proxy | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if1_mac} | ${tg_to_dut_if2_mac} diff --git a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot index a722adaa7b..e0544f71bb 100644 --- a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot @@ -43,7 +43,7 @@ | | ... | ${node} | table1 | ipv4 | ${table1} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table1 | ipv4 | ${table1_oper} -| | And Verify Route IPv4 | ${nodes['TG']} +| | And Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -60,9 +60,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table2 | | Given Setup interfaces and neighbors for IPv4 routing test -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table2 | ipv4 | ${table2} | ${1} @@ -90,7 +90,7 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table3 | ipv4 | ${table3_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv4 | ${nodes['TG']} +| | ... | Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -109,7 +109,7 @@ | | ... | ${node} | table4 | ipv6 | ${table4} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table4 | ipv6 | ${table4_oper} -| | And Verify Route IPv6 | ${nodes['TG']} +| | And Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${next_hop} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -126,9 +126,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table5 | | Given Setup interfaces and neighbors for IPv6 routing test -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table5 | ipv6 | ${table5} | ${1} @@ -156,48 +156,48 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table6 | ipv6 | ${table6_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv6 | ${nodes['TG']} +| | ... | Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} *** Keywords *** | Setup interfaces and neighbors for IPv4 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | Setup interfaces and neighbors for IPv6 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv6 | ${dut_to_tg_if2} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv6 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv6 -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | | Vpp all ra suppress link layer | ${nodes} @@ -209,7 +209,7 @@ | Setup vrf IDs | | [Arguments] | ${node} | ${interface} | ${vrf} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv4 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv6
\ No newline at end of file diff --git a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot index 3325a0f9bd..abcd86e95d 100644 --- a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot @@ -35,7 +35,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -55,7 +55,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -68,7 +68,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_01} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -81,7 +81,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_02} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -94,7 +94,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_03} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -107,13 +107,13 @@ | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\ | | ... | to be sent by DUT1 and verify the received RA packets are correct. | | [Teardown] | SLAAC test teardown | ${dut_node} | ${dut_to_tg_if1} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${address} | ${prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up | | When Honeycomb configures SLAAC | ${dut_node} | ${dut_to_tg_if1} | | ... | ${slaac_data} | | :FOR | ${n} | IN RANGE | ${2} -| | | Then Receive And Check Router Advertisement Packet +| | | Then Receive and verify router advertisement packet | | | ... | ${tg_node} | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${20} diff --git a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot index 1cc385ca2b..b2adb871c5 100644 --- a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot @@ -34,7 +34,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state receive. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_receive} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_receive} @@ -43,7 +43,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state transmit. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_transmit} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_transmit} @@ -52,7 +52,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} @@ -61,7 +61,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} @@ -86,9 +86,9 @@ | | ... | ${node} | ${interface1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${interface2} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_if2} -| | And Honeycomb Configures SPAN on interface +| | And Honeycomb configures SPAN on interface | | ... | ${node} | ${interface2} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_if2} @@ -106,24 +106,24 @@ | | ... | | [Teardown] | Run Keywords | | ... | Show Packet Trace on All DUTs | ${nodes} | AND -| | ... | Honeycomb clears all interface ipv4 neighbors +| | ... | Honeycomb clears all interface IPv4 neighbors | | ... | ${dut_node} | ${dut_to_tg_if1} | AND -| | ... | Honeycomb removes interface ipv4 addresses +| | ... | Honeycomb removes interface IPv4 addresses | | ... | ${dut_node} | ${dut_to_tg_if1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_mac} | | ${settings_5}= | create dictionary | state=both | | ... | iface-ref=${dut_to_tg_if1} | | And InterfaceCLI.All Vpp Interfaces Ready Wait | ${nodes} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${dut_to_tg_if2} | ${settings_5} | | Then Send Packet And Check Received Copies | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -218,17 +218,17 @@ | | ... | on the sub-interface. | | ... | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Sub-interface state from Honeycomb should be | | ... | ${dut_node} | ${interface1} | ${1} | down | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Honeycomb sets the sub-interface up | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix} -| | And And Honeycomb adds interface ipv4 neighbor +| | And And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | | ... | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_mac} | | ${settings_5}= | create dictionary | state=both diff --git a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot index 339fdb8972..409eb13d21 100644 --- a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot @@ -49,7 +49,7 @@ | | ... | ${node} | ${vx_interface} | ${vxlan_settings} | | And VxLAN Operational Data From VAT Should Be | | ... | ${node} | ${vxlan_settings} -| | ${vxlan_index}= | Get Interface index from oper data +| | ${vxlan_index}= | Get interface index from oper data | | ... | ${node} | ${vx_interface} | | Set Suite Variable | ${vxlan_index} diff --git a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot index 3386e1fe60..7daa08bc85 100644 --- a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot @@ -25,7 +25,7 @@ | Resource | resources/libraries/robot/honeycomb/tap.robot | Resource | resources/libraries/robot/honeycomb/notifications.robot | Suite Setup | Run keywords -| ... | Honeycomb sets interface state +| ... | Honeycomb configures interface state | ... | ${node} | ${interface} | down | AND | ... | Honeycomb creates TAP interface | ... | ${node} | ${tap_interface} | ${tap_settings} @@ -41,10 +41,10 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | And Notification listener is established | ${node} -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | And Notification listener should be established | ${node} +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Honeycomb should send interface state notification | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | And Honeycomb should send interface state notification | ${interface} | down | TC02: Honeycomb sends notification on interface deletion @@ -54,6 +54,6 @@ | | ... | ${node} | ${tap_interface} | ${tap_settings} | | And TAP Operational Data From VAT Should Be | | ... | ${node} | ${tap_interface} | ${tap_settings} -| | And Notification listener is established | ${node} +| | And Notification listener should be established | ${node} | | When Honeycomb removes TAP interface | ${node} | ${tap_interface} | | Then Honeycomb should send interface deleted notification | ${tap_interface} diff --git a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot index 5dfa4b5aed..f5f9673230 100644 --- a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot @@ -33,14 +33,14 @@ # =================== | TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP | | [Documentation] | Checks if Honeycomb maintains configuration after both\ -| | ... | Honeycomb and VPP are restarted. +| | ... | Restart Honeycomb and VPP. | | [Tags] | HC_FUNC | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC02: Honeycomb reverts to defaults if persistence files are invalid @@ -62,7 +62,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC04: Honeycomb persists configuration through restart of VPP @@ -73,7 +73,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} # single-feature cases @@ -86,7 +86,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Interface Persistence Check | ${node} | TC06: Persist configuration of IP addresses and neighbors - HC restart @@ -96,7 +96,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Interface Persistence Check | ${node} | TC07: Persist configuration of IP addresses and neighbors - VPP restart @@ -106,7 +106,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Interface Persistence Check | ${node} | TC08: Honeycomb persists configuration of bridge domains - HC and VPP restart @@ -116,7 +116,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC09: Honeycomb persists configuration of bridge domains - HC restart @@ -126,7 +126,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC10: Honeycomb persists configuration of bridge domains - VPP restart @@ -136,7 +136,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} #TODO: All other features diff --git a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot index bdf3b5f6e5..06b6633d97 100644 --- a/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-eth-l2xcbase-iaclbase-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ingress ACL test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG @@ -42,14 +42,14 @@ | | ... | [Top] TG-DUT1-DUT2-TG. | | ... | [Cfg] On DUT1 add source MAC address to classify table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | src @@ -58,7 +58,7 @@ | | ... | src | ${tg_to_dut1_mac} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC02: DUT with iACL MAC dst-addr drops matching pkts @@ -67,14 +67,14 @@ | | ... | [Cfg] On DUT1 add destination MAC address to classify | | ... | table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | dst @@ -83,7 +83,7 @@ | | ... | dst | ${tg_to_dut2_mac} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC03: DUT with iACL MAC src-addr and dst-addr drops matching pkts @@ -92,14 +92,14 @@ | | ... | [Cfg] On DUT1 add source and destination MAC address to classify | | ... | table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index_1} | ${skip_n_1} | ${match_n_1}= | | ... | When Vpp Creates Classify Table L2 | ${dut1_node} | src @@ -115,7 +115,7 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index_1} | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index_2} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC04: DUT with iACL EtherType drops matching pkts @@ -123,14 +123,14 @@ | | ... | [Top] TG-DUT1-DUT2-TG. | | ... | [Cfg] On DUT1 add EtherType IPv4(0x0800) to classify table with 'deny'. | | ... | [Ver] Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | | ${table_index} | ${skip_n} | ${match_n}= | | ... | When Vpp Creates Classify Table Hex @@ -140,5 +140,5 @@ | | ... | 0000000000000000000000000800 | | And Vpp Enable Input ACL Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send and receive ICMP Packet should fail +| | Then ICMP packet transmission should fail | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot index 26df7a8480..04bfb1602b 100644 --- a/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-ethip4-ip4base-iaclbase-func.robot @@ -23,8 +23,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv4 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv4 @@ -54,9 +54,9 @@ | | [Documentation] | | ... | On DUT1 add source IPv4 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -67,13 +67,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -85,11 +85,11 @@ | | ... | ${ip_version} | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -98,9 +98,9 @@ | | [Documentation] | | ... | On DUT1 add destination IPv4 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -114,13 +114,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -132,11 +132,11 @@ | | ... | ${ip_version} | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -145,9 +145,9 @@ | | [Documentation] | | ... | On DUT1 add source and destination IPv4 addresses to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -161,13 +161,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -186,11 +186,11 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_1} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_2} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -199,9 +199,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and TCP protocol (0x06) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -212,12 +212,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -228,10 +228,10 @@ | | ... | 000000000000000000000000000000000000000000000006 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 @@ -239,9 +239,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and UDP protocol (0x11) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -252,12 +252,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -268,10 +268,10 @@ | | ... | 000000000000000000000000000000000000000000000011 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 @@ -279,9 +279,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -292,12 +292,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | source @@ -309,10 +309,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 @@ -320,9 +320,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -333,12 +333,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | destination @@ -350,10 +350,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 @@ -361,9 +361,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -374,12 +374,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP @@ -392,10 +392,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 @@ -403,9 +403,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -416,12 +416,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | source @@ -433,10 +433,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 @@ -444,9 +444,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -457,12 +457,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | destination @@ -474,10 +474,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 @@ -485,9 +485,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -498,12 +498,12 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP @@ -516,9 +516,9 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 diff --git a/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot index 47daac02a5..a3eef2a665 100644 --- a/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot +++ b/tests/func/iacl/eth2p-ethip6-ip6base-iaclbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Classify.Classify | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv6 routing with ingress ACL test cases* | ... | ... | Encapsulations: Eth-IPv6 on links TG-DUT1, TG-DUT2, DUT1-DUT2. IPv6 @@ -55,9 +55,9 @@ | | [Documentation] | | ... | On DUT1 add source IPv6 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -68,14 +68,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -87,11 +87,11 @@ | | ... | ${ip_version} | src | ${test_src_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -100,9 +100,9 @@ | | [Documentation] | | ... | On DUT1 add destination IPv6 address to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -116,14 +116,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -135,11 +135,11 @@ | | ... | ${ip_version} | dst | ${test_dst_ip} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -148,9 +148,9 @@ | | [Documentation] | | ... | On DUT1 add source and destination IPv6 addresses to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -164,14 +164,14 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${non_drop_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -190,11 +190,11 @@ | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_1} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index_2} -| | Then Send packet from Port to Port should failed | ${tg_node} +| | Then Packet transmission from port to port should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${non_drop_src_ip} | ${non_drop_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -203,9 +203,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and TCP protocol (0x06) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -216,13 +216,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -233,10 +233,10 @@ | | ... | 000000000000000000000000000000000000000006 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 @@ -244,9 +244,9 @@ | | [Documentation] | | ... | On DUT1 add protocol mask and UDP protocol (0x11) to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -257,13 +257,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -274,10 +274,10 @@ | | ... | 000000000000000000000000000000000000000011 | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 @@ -285,9 +285,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -298,13 +298,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | source @@ -316,10 +316,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 20 @@ -327,9 +327,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -340,13 +340,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP | destination @@ -358,10 +358,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 20 | 110 @@ -369,9 +369,9 @@ | | [Documentation] | | ... | On DUT1 add TCP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -382,13 +382,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | TCP @@ -401,10 +401,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | TCP | 110 | 25 @@ -412,9 +412,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -425,13 +425,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | source @@ -443,10 +443,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 20 @@ -454,9 +454,9 @@ | | [Documentation] | | ... | On DUT1 add TCP destination ports to classify table with 'deny'.\ | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -467,13 +467,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP | destination @@ -485,10 +485,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 80 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 20 | 110 @@ -496,9 +496,9 @@ | | [Documentation] | | ... | On DUT1 add UDP source and destination ports to classify table\ | | ... | with 'deny'. Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut1_node} @@ -509,13 +509,13 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${hex_mask}= | Compute Classify Hex Mask | ${ip_version} | UDP @@ -528,10 +528,10 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${ip_version} | ${table_index} -| | Then Send TCP or UDP packet should failed | ${tg_node} +| | Then TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 @@ -540,18 +540,18 @@ | | ... | On DUT1 add source MAC address to classify (L2) table and add UDP\ | | ... | source and destination ports to classify (hex) table with 'deny'. | | ... | Make TG verify matching packets are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_tg} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 | | ${table_index} | ${skip_n} | ${match_n}= @@ -569,9 +569,9 @@ | | ... | ${hex_value} | | And Vpp Enable Input Acl Interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${l2_table} | ${table_index} -| | Then Send TCP or UDP packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 110 | 25 -| | And Send TCP or UDP packet should failed | ${tg_node} +| | And TCP or UDP packet transmission should fail | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | ${tg_to_dut1_mac} | | ... | ${tg_to_dut2} | ${dut1_to_tg_mac} | UDP | 80 | 20 diff --git a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot index 2db3899ae8..ab0c6f04c7 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectnl-ip4base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv4 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -51,12 +51,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -71,12 +71,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -91,12 +91,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -112,12 +112,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -132,12 +132,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -153,12 +153,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -174,12 +174,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -195,12 +195,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -215,12 +215,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -236,12 +236,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -257,12 +257,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -277,12 +277,12 @@ | | ... | [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 IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -298,14 +298,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -321,14 +321,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -345,15 +345,15 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -369,20 +369,20 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -399,23 +399,23 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -432,23 +432,23 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -466,24 +466,24 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot index 31cc3a65b7..15bf7e2668 100644 --- a/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot +++ b/tests/func/ipsec/eth2p-ethip4ipsectpt-ip4base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv4 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -52,11 +52,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -71,11 +71,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -90,11 +90,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -109,11 +109,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -127,11 +127,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -146,11 +146,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -165,11 +165,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -184,11 +184,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -202,11 +202,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -221,11 +221,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -240,11 +240,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -258,11 +258,11 @@ | | ... | [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 IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -279,13 +279,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -301,13 +301,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -324,14 +324,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -346,18 +346,18 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -373,21 +373,21 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -403,21 +403,21 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -434,22 +434,22 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot index 0165931990..702d6f5d33 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectnl-ip6base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv6 IPsec tunnel mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -52,12 +52,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -72,12 +72,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -92,12 +92,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -113,12 +113,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -133,12 +133,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -154,12 +154,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -175,12 +175,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -196,12 +196,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -216,12 +216,12 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -237,12 +237,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -258,12 +258,12 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -278,12 +278,12 @@ | | ... | [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 IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -299,14 +299,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -322,14 +322,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -346,15 +346,15 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -370,20 +370,20 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -400,23 +400,23 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -433,23 +433,23 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} @@ -467,24 +467,24 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip} | | ... | ${dut_tun_ip} diff --git a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot index 5f2e0413b0..12cc4e4c29 100644 --- a/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot +++ b/tests/func/ipsec/eth2p-ethip6ipsectpt-ip6base-func.robot @@ -16,10 +16,10 @@ | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV | SKIP_VPP_PATCH -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 IPsec testing +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 IPsec testing | Test Teardown | Run Keywords | VPP IPsec Show | ${dut_node} -| ... | AND | Func Test Teardown +| ... | AND | Tear down functional test | Documentation | *IPv6 IPsec transport mode test suite.* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with one link\ @@ -53,11 +53,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -72,11 +72,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -91,11 +91,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -110,11 +110,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -128,11 +128,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -147,11 +147,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 256 128 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -166,11 +166,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -185,11 +185,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -203,11 +203,11 @@ | | ... | [Ver] Send and receive ESP packet between TG and VPP node. | | ${encr_alg}= | Crypto Alg AES CBC 256 | | ${auth_alg}= | Integ Alg SHA 384 192 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -222,11 +222,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -241,11 +241,11 @@ | | [Tags] | SKIP_PATCH | | ${encr_alg}= | Crypto Alg AES CBC 192 | | ${auth_alg}= | Integ Alg SHA 512 256 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -259,11 +259,11 @@ | | ... | [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 IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} @@ -279,13 +279,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -301,13 +301,13 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -324,14 +324,14 @@ | | ... | [Ref] RFC4303. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | Given Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -346,18 +346,18 @@ | | ... | and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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 And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | 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} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} -| | Then Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | Then Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${new_auth_key} | | ... | ${tg_spi} | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -373,21 +373,21 @@ | | ... | response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${new_auth_key} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -403,21 +403,21 @@ | | ... | no response to be received on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${new_encr_key} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} @@ -434,22 +434,22 @@ | | ... | on TG before and after SA keys update. | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | 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} | | ${encr_key2}= | And Get Second Random String | ${encr_alg} | Crypto | | ${auth_key2}= | And Get Second Random String | ${auth_alg} | Integ | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} | | ${new_encr_key}= | Given Get Second Random String | ${encr_alg} | Crypto | | ${new_auth_key}= | And Get Second Random String | ${auth_alg} | Integ -| | When VPP Update IPsec SA Keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} +| | When Update IPSec SA keys | ${dut_node} | ${l_sa_id} | ${r_sa_id} | | ... | ${new_encr_key} | ${new_auth_key} | | Then Run Keyword And Expect Error | ESP packet Rx timeout -| | ... | Send And Receive IPsec Packet | ${tg_node} | ${tg_if} | ${dut_if_mac} +| | ... | Send IPsec Packet and verify ESP encapsulation in received packet | ${tg_node} | ${tg_if} | ${dut_if_mac} | | ... | ${encr_alg} | ${encr_key2} | ${auth_alg} | ${auth_key2} | ${tg_spi} | | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index b7d25746d7..d3bf4b517d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -28,8 +28,8 @@ | Resource | resources/libraries/robot/qemu.robot | Resource | resources/libraries/robot/bridge_domain.robot | Force Tags | VM_ENV | HW_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 routing test cases with vhost user interface* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 @@ -61,12 +61,12 @@ | | ... | Both have IP addresses from same network. On VM is set bridge to pass | | ... | packet from a one vhost user interface to another one. | | [Teardown] | Run Keywords -| | ... | Stop and Clear QEMU | ${dut_node} | ${vm_node} | AND -| | ... | Func Test Teardown +| | ... | Stop and clear QEMU | ${dut_node} | ${vm_node} | AND +| | ... | Tear down functional test | | -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1} | | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2} | | And Set Interface State | ${dut_node} | ${vhost1} | up @@ -75,7 +75,7 @@ | | ... | ${vhost2} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} | | ... | ${dut_to_tg_if2} | ${fib_table_2} -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_ip1} | ${prefix_length} | | ... | ${dut_node} | ${vhost1} | ${net2_ip1} | ${prefix_length} | | ... | ${dut_node} | ${vhost2} | ${net2_ip2} | ${prefix_length} @@ -90,9 +90,9 @@ | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | | ... | ${tg_to_dut_if2_mac} -| | When VM for Vhost L2BD forwarding is setup +| | When Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot index 71b3da4092..eadcdee43d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-func.robot @@ -19,17 +19,17 @@ | Resource | resources/libraries/robot/ipv4.robot | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords -| ... | Setup all DUTs before test | AND -| ... | Setup all TGs before traffic script | AND +| ... | Configure all DUTs before test | AND +| ... | Configure all TGs for traffic script | AND | ... | Update All Interface Data On All Nodes | ${nodes} | AND -| ... | Setup DUT nodes for IPv4 testing +| ... | Configure DUT nodes for IPv4 testing | Test Setup | Run Keywords | Save VPP PIDs | AND | ... | Reset VAT History On All DUTs | ${nodes} | AND | ... | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND | ... | Show VAT History On All DUTs | ${nodes} | AND -| ... | Check VPP PID in Teardown +| ... | Verify VPP PID in Teardown | Documentation | *IPv4 routing test cases* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 @@ -53,7 +53,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${0} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC02: DUT routes IPv4 to its egress interface | | [Tags] | VM_ENV @@ -65,7 +65,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Egress Interface | | ${hops}= | Set Variable | ${0} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC03: DUT1 routes IPv4 to DUT2 ingress interface | | [Tags] | VM_ENV @@ -77,7 +77,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${1} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC04: DUT1 routes IPv4 to DUT2 egress interface | | [Tags] | VM_ENV @@ -89,7 +89,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Egress Interface | | ${hops}= | Set Variable | ${1} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC05: DUT1 and DUT2 route IPv4 between TG interfaces | | [Tags] | VM_ENV @@ -101,7 +101,7 @@ | | ${src_port} | ${src_node}= | First Interface | | ${dst_port} | ${dst_node}= | Last Interface | | ${hops}= | Set Variable | ${2} -| | Node "${src_node}" interface "${src_port}" can route to node "${dst_node}" interface "${dst_port}" ${hops} hops away using IPv4 +| | Route traffic from interface '${src_port}' on node '${src_node}' to interface '${dst_port}' on node '${dst_node}' '${hops}' hops away using IPv4 | TC06: DUT replies to ICMPv4 Echo Reqs with size 64B-to-1500B-incr-1B | | [Tags] | VM_ENV @@ -109,17 +109,17 @@ | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 +| | Execute IPv4 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | TC07: DUT replies to ICMPv4 Echo Reqs with size 1500B-to-9000B-incr-10B | | [Documentation] | | ... | Make TG send ICMPv4 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv4 Echo Replies are correct. -| | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} +| | [Setup] | Configure MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} -| | ... | AND | Check VPP PID in Teardown +| | ... | AND | Verify VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface @@ -128,11 +128,11 @@ | | # IPv4 header and ICMP header | | ${end_size}= | Evaluate | ${mtu} - 14 - 4 - 20 - 8 | | Run Keyword If | ${mtu} > 1518 -| | ... | Ipv4 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} +| | ... | Execute IPv4 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | | ... | 1452 | ${end_size} | 10 | TC08: DUT replies to ARP request | | [Tags] | VM_ENV | SKIP_VPP_PATCH | | [Documentation] | | ... | Make TG send ARP Request to DUT and verify ARP Reply is correct.\ -| | Send ARP request and validate response | ${nodes['TG']} | ${nodes['DUT1']} +| | Send ARP request and verify response | ${nodes['TG']} | ${nodes['DUT1']} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot index 0950610559..f6b551e7a3 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4arp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 ARP test cases* | ... | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2: @@ -45,16 +45,16 @@ | | ... | Make TG send test packet destined to IPv4 address of its other\ | | ... | interface connected to DUT2. Make TG verify DUT2 sends ARP | | ... | Request for locally connected TG IPv4 address. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_dut2} | ${dut1_to_dut2_ip} | ${prefix_length} -| | Then Send Packet And Check ARP Request | ${tg_node} +| | Then Send packet and verify ARP request | ${tg_node} | | ... | ${test_src_ip} | ${dut1_to_dut2_ip_GW} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${dut1_to_dut2_ip} | ${dut1_to_dut2_ip_GW} @@ -64,10 +64,10 @@ | | ... | Make TG send test packet destined to IPv4 address matching\ | | ... | static route on DUT2. Make TG verify DUT2 sends ARP Request for | | ... | next hop of the static route. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} @@ -76,7 +76,7 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${test_dst_ip} | ${prefix_length} | | ... | ${dut1_to_dut2_ip_GW} | ${dut1_to_dut2} | resolve_attempts=${NONE} -| | Then Send Packet And Check ARP Request | ${tg_node} +| | Then Send packet and verify ARP request | ${tg_node} | | ... | ${test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut2} | ${dut1_to_dut2_mac} | | ... | ${dut1_to_dut2_ip} | ${dut1_to_dut2_ip_GW} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot index f55ee64df9..8c707fc18d 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4ecmp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ipv4 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ @@ -51,9 +51,9 @@ | | ... | [Cfg] On DUT configure multipath routing wiht two equal-cost paths. | | ... | [Ver] TG sends 100 IPv4 ICMP packets traffic on the first link to\ | | ... | DUT. On second link to TG verify if traffic is divided into two paths. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${ip_1} | ${prefix_length} | | And Set Interface Address | ${dut_node} @@ -68,7 +68,7 @@ | | And Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} -| | Then Send Packets And Check Multipath Routing | ${tg_node} +| | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} | | ... | ${neighbor_1_mac} | ${neighbor_2_mac} diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot index 765a54b6d5..afe4581b16 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-ip4proxyarp-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.ProxyArp | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC1027 Proxy ARP test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with @@ -54,9 +54,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is in range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -76,9 +76,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is from beginning of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -98,9 +98,9 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 sends correct ARP reply on behalf of machine which | | ... | IP is from end of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} @@ -120,16 +120,16 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 does not send ARP reply on behalf of machine which | | ... | IP is from below of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr} | | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send ARP Request should failed | ${tg_node} | ${tg_to_dut1_name} +| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut1_ip} | ${fail_test_lo_ip} @@ -142,15 +142,15 @@ | | ... | [Ver] Make TG send ARP request to DUT1 interface, | | ... | verify if DUT1 does not send ARP reply on behalf of machine which | | ... | IP is from above of the IP range. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_tg_name}= | Get interface name | ${dut1_node} | ${dut1_to_tg} | | ${tg_to_dut1_name}= | Get interface name | ${tg_node} | ${tg_to_dut1} | | When Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Vpp Add Proxy ARP | ${dut1_node} | ${lo_ip4_addr} | ${hi_ip4_addr} | | And Vpp Proxy ARP Interface Enable | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send ARP Request should failed | ${tg_node} | ${tg_to_dut1_name} +| | Then ARP request should fail | ${tg_node} | ${tg_to_dut1_name} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut1_ip} | ${fail_test_hi_ip} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot index d08c291f4f..88c739dd27 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-func.robot @@ -20,17 +20,17 @@ | Variables | resources/libraries/python/IPv6NodesAddr.py | ${nodes} | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | SKIP_VPP_PATCH | Suite Setup | Run Keywords -| ... | Setup ipv6 to all dut in topology | ${nodes} | ${nodes_ipv6_addr} | AND -| ... | Vpp nodes ra suppress link layer | ${nodes} | AND -| ... | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} | AND -| ... | Setup all TGs before traffic script +| ... | Configure IPv6 on all DUTs in topology | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Suppress ICMPv6 router advertisement message | ${nodes} | AND +| ... | Configure IPv6 routing on all DUTs | ${nodes} | ${nodes_ipv6_addr} | AND +| ... | Configure all TGs for traffic script | Test Setup | Run Keywords | Save VPP PIDs | AND | ... | Reset VAT History On All DUTs | ${nodes} | AND | ... | Clear interface counters on all vpp nodes in topology | ${nodes} | Test Teardown | Run Keywords | ... | Show packet trace on all DUTs | ${nodes} | AND | ... | Show VAT History On All DUTs | ${nodes} | AND -| ... | Check VPP PID in Teardown +| ... | Verify VPP PID in Teardown | Documentation | *IPv6 routing test cases* | ... | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery. @@ -49,7 +49,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req to DUT ingress interface. Make TG\ | | ... | verify ICMPv6 Echo Reply is correct. -| | Ipv6 icmp echo | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} +| | Send IPv6 icmp echo request to DUT1 ingress inteface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} | TC02: DUT replies to ICMPv6 Echo Req pkt with size 64B-to-1500B-incr-1B | | [Tags] | VM_ENV @@ -57,17 +57,17 @@ | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 64B to 1500B with increment step | | ... | of 1Byte. Make TG verify ICMP Echo Replies are correct. -| | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr} +| | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | 0 | 1452 | 1 | ${nodes_ipv6_addr} | TC03: DUT replies to ICMPv6 Echo Req pkt with size 1500B-to-9000B-incr-10B | | [Documentation] | | ... | Make TG send ICMPv6 Echo Reqs to DUT ingress interface,\ | | ... | incrementating frame size from 1500B to 9000B with increment | | ... | step of 10Bytes. Make TG verify ICMPv6 Echo Replies are correct. -| | [Setup] | Setup MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} +| | [Setup] | Configure MTU on TG based on MTU on DUT | ${nodes['TG']} | ${nodes['DUT1']} | | [Teardown] | Run keywords | | ... | Set default Ethernet MTU on all interfaces on node | ${nodes['TG']} -| | ... | AND | Check VPP PID in Teardown +| | ... | AND | Verify VPP PID in Teardown | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | | Compute Path | | ${dut_port} | ${dut_node}= | Last Interface @@ -76,7 +76,7 @@ | | # IPv6 header and ICMPv6 header | | ${end_size}= | Evaluate | ${mtu} - 14 - 4 - 40 - 8 | | Run Keyword If | ${mtu} > 1518 -| | ... | Ipv6 icmp echo sweep | ${nodes['TG']} | ${nodes['DUT1']} +| | ... | Execute IPv6 ICMP echo sweep | ${nodes['TG']} | ${nodes['DUT1']} | | ... | 1452 | ${end_size} | 10 | ${nodes_ipv6_addr} | TC04: DUT routes to its egress interface @@ -84,7 +84,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT1 egress interface\ | | ... | connected to DUT2. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut1 egress | ${nodes['TG']} | ${nodes['DUT1']} | +| | Send IPv6 ICMP echo request to DUT1 egress interface and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC05: DUT1 routes to DUT2 ingress interface @@ -92,7 +92,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 ingress interface\ | | ... | connected to DUT1. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut2 via dut1 | ${nodes['TG']} | ${nodes['DUT1']} +| | Send IPv6 ICMP echo request to DUT2 via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC06: DUT1 routes to DUT2 egress interface @@ -100,7 +100,7 @@ | | [Documentation] | | ... | Make TG send ICMPv6 Echo Req towards DUT2 egress interface\ | | ... | connected to TG. Make TG verify ICMPv6 Echo Reply is correct. -| | Ipv6 tg to dut2 egress via dut1 | ${nodes['TG']} | ${nodes['DUT1']} +| | Send IPv6 ICMP echo request to DUT2 egress interface via DUT1 and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes_ipv6_addr} | TC07: DUT1 and DUT2 route between TG interfaces @@ -117,4 +117,4 @@ | | ... | On DUT configure interface IPv6 address in the main routing\ | | ... | domain. Make TG send Neighbor Solicitation message on the link | | ... | to DUT and verify DUT Neighbor Advertisement reply is correct. -| | Ipv6 neighbor solicitation | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} +| | Send IPv6 neighbor solicitation and verify answer | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes_ipv6_addr} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot index 989ec69434..e65ac9aa76 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ecmp-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Ipv6 Multipath routing test cases* | ... | ... | *[Top] Network topologies:* TG=DUT 2-node topology with two links\ @@ -50,9 +50,9 @@ | | ... | [Cfg] On DUT configure multipath routing wiht two equal-cost paths. | | ... | [Ver] TG sends 100 IPv6 ICMP packets traffic on the first link to\ | | ... | DUT. On second link to TG verify if traffic is divided into two paths. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are UP +| | And Set interfaces in 2-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut_node} | | ... | ${dut_to_tg_if2} | ${ip_1} | ${prefix_length} | | And Vpp Set If Ipv6 Addr | ${dut_node} @@ -61,14 +61,14 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_1_ip} | ${neighbor_1_mac} | |Â And Add Ip Neighbor | | ... | ${dut_node} | ${dut_to_tg_if1} | ${neighbor_2_ip} | ${neighbor_2_mac} -| | And Vpp Nodes RA Suppress Link Layer | ${nodes} +| | And Suppress ICMPv6 router advertisement message | ${nodes} | | When Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_1_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} | | And Vpp Route Add | | ... | ${dut_node} | ${test_dst_ip} | ${prefix_length} | ${neighbor_2_ip} | | ... | ${dut_to_tg_if1} | resolve_attempts=${NONE} | multipath=${TRUE} -| | Then Send Packets And Check Multipath Routing | ${tg_node} +| | Then Send packets and verify multipath routing | ${tg_node} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${dut_to_tg_if1_mac} | | ... | ${neighbor_1_mac} | ${neighbor_2_mac} diff --git a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot index e45ce730c9..ea0864e4ff 100644 --- a/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot +++ b/tests/func/ipv6/eth2p-ethip6-ip6base-ip6ra-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv6 Router Advertisement test cases* | ... | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links @@ -44,13 +44,13 @@ | | ... | [Ver] Make TG wait for IPv6 Router Advertisement packet to be sent\ | | ... | by DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg} -| | Then Receive And Check Router Advertisement Packet +| | Then Receive and verify router advertisement packet | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac} | TC02: DUT retransmits RA on IPv6 enabled interface after a set interval @@ -60,15 +60,15 @@ | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\ | | ... | to be sent by DUT1 and verify the received RA packets are correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When Vpp RA Send After Interval | ${dut1_node} | ${dut1_to_tg} | | ... | interval=${interval} | | :FOR | ${n} | IN RANGE | ${2} -| | | Then Receive And Check Router Advertisement Packet +| | | Then Receive and verify router advertisement packet | | | ... | ${tg_node} | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${interval} | TC03: DUT responds to Router Solicitation request @@ -79,9 +79,9 @@ | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\ | | ... | for response from DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg} @@ -97,9 +97,9 @@ | | ... | [Ver] Make TG send IPv6 Router Solicitation request to DUT1, listen\ | | ... | for response from DUT1 and verify the received RA packet is correct. | | [Tags] | EXPECTED_FAILING -| | Given Path For 3-node Testing Is Set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces In 3-node Path Are Up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If Ipv6 Addr | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | When VPP RA Suppress Link Layer | ${dut1_node} | ${dut1_to_tg} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index b2279b90fc..e15f080577 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,28 +52,28 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2BDs (MAC learn) switches ICMPv6 between TG and VM links @@ -85,26 +85,26 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot index 160bf57ef4..4d201004af 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemaclrn-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -46,7 +46,7 @@ | | ... | [Top] TG=DUT1; TG-DUT1-DUT2-TG. [Enc] None. [Cfg] Discovered \ | | ... | active interfaces. [Ver] Report active interfaces on DUT. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO | 3_NODE_SINGLE_LINK_TOPO -| | VPP reports interfaces on | ${nodes['DUT1']} +| | Report VPP interfaces | ${nodes['DUT1']} | TC02: DUT with L2BD (MAC learning) switch ICMPv4 between two TG links | | [Documentation] @@ -55,15 +55,15 @@ | | ... | ICMPv4 Echo Req pkts are switched thru DUT1 in both directions | | ... | and are correct on receive. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Set interfaces in 2-node circular topology up +| | When Create bridge domain | ${dut_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id1} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC03: DUT1 and DUT2 with L2BD (MAC learning) switch between two TG links @@ -73,18 +73,18 @@ | | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in | | ... | both directions and are correct on receive. [Ref] | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg} +| | And Set interfaces in 3-node circular topology up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot index ad5258bb9a..88d3260e1e 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-eth-2vhost-1vm-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM @@ -52,50 +52,50 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2BDs (static MACs) switches ICMPv6 between TG and VM links @@ -107,48 +107,48 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on | | ... | receive. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id1} +| | And Create bridge domain | ${dut_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${vhost_if1} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut_node} | ${bd_id2} +| | And Create bridge domain | ${dut_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if2} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if2} | | ... | ${dut_node} | | ... | ${dut_to_tg_if2} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${dut_node} | | ... | ${vhost_if2} | | ... | ${bd_id2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot index a369d8e642..2cfa02ae99 100644 --- a/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot +++ b/tests/func/l2bd/eth2p-eth-l2bdbasemacstc-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,40 +47,40 @@ | | ... | TG verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 | | ... | in both directions and are correct on receive. [Ref] | | [Tags] | 3_NODE_SINGLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} +| | And Set interfaces in 3-node circular topology up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut1} | | ... | ${dut1_node} | | ... | ${dut1_to_tg} | | ... | ${bd_id1} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut2} | | ... | ${dut1_node} | | ... | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} | | ... | learn=${FALSE} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut1} | | ... | ${dut2_node} | | ... | ${dut2_to_dut1} | | ... | ${bd_id2} -| | And Destination port is added to L2FIB on DUT node | ${tg_node} +| | And Add destination port to L2FIB | ${tg_node} | | ... | ${tg_to_dut2} | | ... | ${dut2_node} | | ... | ${dut2_to_tg} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} diff --git a/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot index 295a03eadc..2136394cf5 100644 --- a/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/l2bd/eth4p-eth-l2bdbasemaclrn-l2shg-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 bridge-domain test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -53,41 +53,41 @@ | | ... | are correct on receive; verify no pkts are switched thru SHG | | ... | isolated interfaces. [Ref] | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up -| | When Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Set interfaces in 3-node BD-SHG test up +| | When Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} | ${shg2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id2} | ${shg2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_dut1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_dut1} | | ... | ${bd_id2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut1_if1} | | | ... | ${tg_to_dut1_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot index 583a5ba052..0763b88142 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT=VM 3-node topology with VM and @@ -52,20 +52,20 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets | | ... | are received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | TC02: DUT with two L2XCs switches ICMPv6 between TG and local VM links @@ -77,19 +77,19 @@ | | ... | be switched by DUT to and from VM; verify all packets are | | ... | received. [Ref] | | ... -| | [Teardown] | Run Keywords | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| | ... | AND | Func Test Teardown +| | [Teardown] | Run Keywords | Stop and clear QEMU | ${dut_node} | ${vm_node} +| | ... | AND | Tear down functional test | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut_node} +| | And Set interfaces in 2-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} -| | And L2 Setup Xconnect on DUT | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -| | And VM for Vhost L2BD forwarding is setup | ${dut_node} | ${sock1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} +| | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} +| | And Configure VM for vhost L2BD forwarding | ${dut_node} | ${sock1} | | ... | ${sock2} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} diff --git a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot index 9aa606a0c9..2c4f4625e6 100644 --- a/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot +++ b/tests/func/l2xc/eth2p-eth-l2xcbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.NodePath | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,15 +47,15 @@ | | ... | Make TG send ICMPv4 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | TC02: DUT1 and DUT2 with L2XC switch ICMPv6 between two TG links @@ -66,13 +66,13 @@ | | ... | Make TG send ICMPv6 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And L2 setup xconnect on DUT +| | And Set interfaces in 3-node circular topology up +| | And Configure L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_dut2} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | When All Vpp Interfaces Ready Wait | ${nodes} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/lisp/api-crud-lisp-func.robot b/tests/func/lisp/api-crud-lisp-func.robot index 013eb7258c..b627cad8a9 100644 --- a/tests/func/lisp/api-crud-lisp-func.robot +++ b/tests/func/lisp/api-crud-lisp-func.robot @@ -23,8 +23,8 @@ | Variables | resources/test_data/lisp/api/lisp_api_resources.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *API test cases* | ... | ... | *[Top] Network Topologies:* DUT1 1-node topology. @@ -46,10 +46,10 @@ | | ... | DUT1 enable LISP. [Ver1] Check DUT1 if LISP is enabled. [Cfg2] | | ... | Then disable LISP. [Ver2] Check DUT1 if LISP is disabled. [Ref] | | ... | RFC6830. -| | When Enable lisp | ${nodes['DUT1']} -| | Then Check if lisp is enabled | ${nodes['DUT1']} | ${lisp_status} -| | When Disable lisp | ${nodes['DUT1']} -| | Then Check if lisp is disabled | ${nodes['DUT1']} | ${lisp_status} +| | When Enable LISP | ${nodes['DUT1']} +| | Then LISP should be enabled | ${nodes['DUT1']} | ${lisp_status} +| | When Disable LISP | ${nodes['DUT1']} +| | Then LISP Should be disabled | ${nodes['DUT1']} | ${lisp_status} | TC02: DUT can add and delete locator_set | | [Documentation] @@ -58,13 +58,13 @@ | | ... | configured locator_set and locator are correct. [Cfg2] Then | | ... | remove locator_set and locator. [Ver2] check DUT1 locator_set | | ... | and locator are removed. [Ref] RFC6830. -| | Given Lisp locator_set data is prepared +| | Given Generate LISP locator_set data | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC03: DUT can add, reset and delete locator_set | | [Documentation] @@ -77,11 +77,11 @@ | | ... | [Ref] RFC6830. | | Given Lisp locator_set data use for test reset locator_set are prepared | | ... | ${nodes['DUT1']} | ${locator_set_num} -| | And Enable lisp | ${nodes['DUT1']} -| | When Lisp locator_set data is set | ${nodes['DUT1']} -| | Then Lisp locator_set is set correctly | ${nodes['DUT1']} -| | When Delete all lisp locator_set from VPP | ${nodes['DUT1']} -| | Then Lisp locator_set should be unset | ${nodes['DUT1']} +| | And Enable LISP | ${nodes['DUT1']} +| | When Configure LISP locator_set data | ${nodes['DUT1']} +| | Then LISP locator_set shpuld be configured correctly | ${nodes['DUT1']} +| | When Delete all LISP locator_set from VPP | ${nodes['DUT1']} +| | Then LISP locator_set should be unset | ${nodes['DUT1']} | TC04: DUT can add and delete eid address | | [Documentation] @@ -89,12 +89,12 @@ | | ... | configure LISP eid IP address. [Ver1] Check DUT1 configured data | | ... | is correct. [Cfg2] Remove configured data. [Ver2] Check DUT1 all | | ... | eid IP addresses are removed. [Ref] RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp eid address is set | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid address is set correctly to eid table +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP eid address | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid address should be set correctly to eid table | | ... | ${nodes['DUT1']} | ${eid_table_vat} -| | When Delete all lisp eid address from VPP | ${nodes['DUT1']} | ${eid_table} -| | Then Lisp eid table should be empty | ${nodes['DUT1']} +| | When Delete all LISP eid address from VPP | ${nodes['DUT1']} | ${eid_table} +| | Then LISP eid table should be empty | ${nodes['DUT1']} | TC05: DUT can add and delete LISP map resolver address | | [Documentation] @@ -103,10 +103,10 @@ | | ... | DUT1 configured data is correct. [Cfg2] Remove configured data. | | ... | [Ver2] Check DUT1 all map resolver addresses are removed. [Ref] | | ... | RFC6830. -| | Given Enable lisp | ${nodes['DUT1']} -| | When Lisp map resolver address is set | ${nodes['DUT1']} | ${map_resolver} -| | Then Lisp map resolver address is set correctly +| | Given Enable LISP | ${nodes['DUT1']} +| | When Configure LISP map resolver address | ${nodes['DUT1']} | ${map_resolver} +| | Then LISP map resolver address should be configured correctly | | ... | ${nodes['DUT1']} | ${map_resolver} -| | When Delete all lisp map resolver address from VPP +| | When Delete all LISP map resolver address from VPP | | ... | ${nodes['DUT1']} | ${map_resolver} -| | Then Lip map resolver address should be empty | ${nodes['DUT1']} +| | Then LISP map resolver address should be empty | ${nodes['DUT1']} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 74d25e8d02..32b3b5c75c 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -35,13 +35,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -86,26 +86,26 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -128,7 +128,7 @@ | | Given Setup 3-node Topology | | And Add IP Neighbors | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -138,20 +138,20 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.Get Sw If Index | | ... | ${dut2_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -165,9 +165,9 @@ | | ... | Default is 0. | | ... | | [Arguments] | ${fib_table}=0 -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} @@ -203,11 +203,11 @@ | | ... | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index b78dacbefa..80ee675c3e 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -35,12 +35,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv4-ip4-ipsec-lispgpe-ip4 - main fib, vrf (gpe_vni-to-vrf)* | ... @@ -80,26 +80,26 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -121,7 +121,7 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -129,20 +129,20 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4} | | ... | ${tg2_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4} | | ... | ${tg1_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -164,27 +164,27 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} | | And Add IP Neighbors -| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Set up LISP GPE topology +| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -206,29 +206,29 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} | | And Add IP Neighbors -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | When Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.Get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip4} | | ... | ${tg2_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip4} | | ... | ${tg1_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -242,9 +242,9 @@ | | ... | Default is 0. | | ... | | [Arguments] | ${fib_table}=0 -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index cc79d239e6..90b62e1f87 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -79,20 +79,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -118,20 +118,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -141,9 +141,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -178,12 +178,12 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index e0b73c7185..86db5f5bac 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,20 +75,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,22 +108,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -133,9 +133,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -153,7 +153,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 16a10139f0..81d5f758ad 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -38,12 +38,12 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, vrf, virt2lisp,\ | ... | phy2lisp* @@ -75,28 +75,28 @@ | | ... | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4} | | Setup Topology And Lisp | ${fib_table_1} | ${dut1_dut2_vni} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -106,9 +106,9 @@ | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. | | [Arguments] | ${fib_table}=0 | ${vni_table}=0 | ${ip6}=${FALSE} -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | | ... | ${prefix4} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} @@ -126,7 +126,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot index 9ab69b2d71..0a7338c26f 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IP AFI independent functional tests.* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -56,10 +56,10 @@ | | ... | [Cfg3] Re-enable LISP. | | ... | [Ver3] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,26 +74,26 @@ | | ... | ${tg_to_dut2_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} | | When Disable Lisp | ${dut1_node} -| | Then Send packet from Port to Port should failed +| | Then Packet transmission from port to port should fail | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send packet from Port to Port should failed +| | And Packet transmission from port to port should fail | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -110,11 +110,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['seid']} | | ... | ${dut2_to_dut1_ip4_static_adjacency['prefix']} -| | Then Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | Then Wait Until Keyword Succeeds | 2x | 5s | Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Wait Until Keyword Succeeds | 2x | 5s | Send Packet And Check Headers +| | And Wait Until Keyword Succeeds | 2x | 5s | Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot index c0a411cc4a..04c73db933 100644 --- a/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip4lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -78,17 +78,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index f9860e859e..512f63ee72 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,10 +68,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv4 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} @@ -84,18 +84,18 @@ | | ... | ${dut2_to_dut1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -115,11 +115,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index d095b79f97..adb01ee289 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,26 +68,26 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} | | And Add IP Neighbors -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 7199cda821..d85f009c84 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -33,13 +33,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -69,20 +69,20 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -90,11 +90,11 @@ | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -114,14 +114,14 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 65c6e932ba..86d7ee8c0e 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -33,12 +33,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip4-lispgpe-ip4 encapsulation test cases* | ... @@ -68,31 +68,31 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} | | ... | ${dut1_to_dut2_ip4_static_adjacency} | | ... | ${dut2_to_dut1_ip4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot index e7d89744b5..f74af9607f 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -29,13 +29,13 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -63,10 +63,10 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -82,18 +82,18 @@ | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} | | ... | ${dut1_to_dut2_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -108,11 +108,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index cedb942e24..2d1a9c4253 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -59,10 +59,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -73,30 +73,30 @@ | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | ${dut2_ip6o4_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip6o4} | | ... | ${dut2_to_dut1_ip6o4_reconf} | ${dut_prefix6o4} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut1_ip6o4_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 529d0d467b..e5bc484b75 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -29,8 +29,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} | Documentation | *LISP static adjacency test cases* @@ -61,15 +61,15 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Add IP Neighbors -| | And IP addresses are set on interfaces +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} @@ -77,18 +77,18 @@ | | ... | ${dut_prefix6o4} | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} | | ... | ${dut1_ip6o4_static_adjacency} | | ... | ${dut2_ip6o4_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6o4} | ${tg2_ip6o4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6o4} | ${tg1_ip6o4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index 9a1800b608..f125dcbe39 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -38,13 +38,13 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -78,20 +78,20 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp | | And Setup Qemu DUT1 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -117,20 +117,20 @@ | | ... | ${dut1_node} | ${lisp_gpe_int} | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | ${lisp_gpe_int} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -139,9 +139,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -161,7 +161,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -176,11 +176,11 @@ | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot index 150a6fee92..d67928c7ab 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip4base-func.robot @@ -37,8 +37,8 @@ | Variables | resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip4-ipsec-lispgpe-ip6 - main fib, virt2lisp, phy2lisp* | ... @@ -69,20 +69,20 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -102,22 +102,22 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology And Lisp -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | ${lisp_gpe_int} -| | When VPP Setup IPsec Manual Keyed Connection +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4} | ${tg2_ip4} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4} | ${tg1_ip4} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -126,9 +126,9 @@ | Setup Topology And Lisp | | [Documentation] | Setup IPs and neighbors for interfaces on DUT1 and DUT2\ | | ... | and then setup LISP. -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -148,7 +148,7 @@ | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} | | ... | ${tg_to_dut1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Set up LISP GPE topology +| | Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index c470b3c38e..66c8a58abc 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -38,14 +38,14 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -90,26 +90,26 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -131,7 +131,7 @@ | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology | | And Setup Qemu DUT1 -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -141,29 +141,29 @@ | | ... | ${dut1_node} | lisp_gpe0 | | ${lisp2_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut2_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp1_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp2_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} @@ -194,11 +194,11 @@ | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up | | Vpp RA Suppress Link Layer | ${dut1_node} | ${vhost2} -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} diff --git a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot index 8475a68363..e68ecf550d 100644 --- a/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6ipsectptlispgpe-ip6base-func.robot @@ -38,9 +38,9 @@ | Variables | resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipsec_ipv6.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | SKIP_VPP_PATCH | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} -| Test Teardown | Func Test Teardown +| Test Teardown | Tear down functional test | ... | Documentation | *IPv6 - ip6-ipsec-lispgpe-ip6 - main fib, | ... | vrf (gpe_vni-to-vrf), phy2lisp, virt2lisp* @@ -80,26 +80,26 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${dut1_to_dut2} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | | ... | ${dut1_to_dut2_ip6} | ${dut2_to_dut1_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${dut2_to_dut1} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | | ... | ${dut2_to_dut1_ip6} | ${dut1_to_dut2_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -120,7 +120,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup Topology -| | And Set up LISP GPE topology +| | And Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -128,29 +128,29 @@ | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ${lisp_if_idx}= | resources.libraries.python.InterfaceUtil.get sw if index | | ... | ${dut1_node} | lisp_gpe0 -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | When VPP Setup IPsec Manual Keyed Connection +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | When Configure manual keyed connection for IPSec | | ... | ${dut1_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi} | ${tg1_ip6} | | ... | ${tg2_ip6} -| | And VPP Setup IPsec Manual Keyed Connection +| | And Configure manual keyed connection for IPSec | | ... | ${dut2_node} | ${lisp_if_idx} | ${encr_alg} | ${encr_key} | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi} | ${tg2_ip6} | | ... | ${tg1_ip6} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} *** Keywords *** | Setup Topology -| | Path for 3-node testing is set +| | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | Interfaces in 3-node path are up +| | Set interfaces in 3-node circular topology up | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | | ... | ${prefix6} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot index 405aa65f72..af550b319b 100644 --- a/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot +++ b/tests/func/lisp/eth2p-ethip6lisp-l2bdbasemaclrn-func.robot @@ -29,8 +29,8 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | ... | Documentation | *l2-lispgpe-ip6 encapsulation test cases* | ... @@ -58,10 +58,10 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip6} | ${prefix6} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} @@ -79,17 +79,17 @@ | | And Add Interface To L2 BD | ${dut1_node} | ${dut1_to_tg} | ${vpp_bd_id} | | And Create L2 BD | ${dut2_node} | ${vpp_bd_id} | | And Add Interface To L2 BD | ${dut2_node} | ${dut2_to_tg} | ${vpp_bd_id} -| | And Set up L2 Lisp on DUT | ${dut1_node} +| | And Configure L2 LISP on DUT | ${dut1_node} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | And Set up L2 Lisp on DUT | ${dut2_node} +| | And Configure L2 LISP on DUT | ${dut2_node} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${lisp_dut_settings} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_if1_mac} | ${tg_if2_mac} | | ... | ${tg_to_dut2} | ${tg_if1_mac} | ${tg_if2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_if2_mac} | ${tg_if1_mac} | | ... | ${tg_to_dut1} | ${tg_if2_mac} | ${tg_if1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot index e47e8d2cc4..d44aabc0f2 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip4base-func.robot @@ -24,8 +24,8 @@ | Variables | resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py | Force Tags | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO | ... | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *LISP static adjacency test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ @@ -55,10 +55,10 @@ | | ... | [Cfg2] Reconf LISP. | | ... | [Ver2] Verify packets are received again via LISP tunnel. | | ... | [Ref] RFC6830. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 3-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6} | | ... | ${dut1_node} | ${dut1_to_tg} @@ -74,30 +74,30 @@ | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4o6} | | ... | ${tg_to_dut1_mac} | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up Lisp topology +| | When Configure LISP topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} | | ... | ${dut1_ip4o6_static_adjacency} | ${dut2_ip4o6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | When Change Lisp Configuration | ${dut1_node} | ${dut2_node} +| | When Change LISP Configuration | ${dut1_node} | ${dut2_node} | | ... | ${dut1_to_dut2} | ${dut2_to_dut1} | ${dut1_to_dut2_mac} | | ... | ${dut2_to_dut1_mac} | ${dut1_to_dut2_ip4o6} | | ... | ${dut2_to_dut1_ip4o6_reconf} | ${dut_prefix4o6} | | ... | ${dut1_ip4o6_static_adjacency} | | ... | ${dut1_ip4o6_static_adjacency_reconf} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip4o6} | ${tg2_ip4o6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip4o6} | ${tg1_ip4o6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac}
\ No newline at end of file diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index ad85888aa7..b0c519f799 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | DUTs and LISP GPE tunnel between them; verify IPv6 headers on\ | | ... | received packets are correct. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,18 +80,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | And Setup Qemu DUT1 -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -112,14 +112,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index ba81519e7b..73e66561d5 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Vpp Set If IPv6 Addr | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr @@ -80,17 +80,17 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index cda0254eba..1f409c98a0 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -31,14 +31,14 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Stop and Clear QEMU | ${nodes['DUT1']} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${nodes['DUT1']} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -69,9 +69,9 @@ | | ... | [Ref] RFC6830. | | ... | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -86,7 +86,7 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -94,11 +94,11 @@ | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} | | And Setup Qemu DUT1 | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dst_vhost_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} @@ -119,14 +119,14 @@ | | ... | ${prefix6} | | Set Interface State | ${dut1_node} | ${vhost1} | up | | Set Interface State | ${dut1_node} | ${vhost2} | up -| | Bridge domain on DUT node is created | ${dut1_node} | ${bid} | learn=${TRUE} -| | Interface is added to bridge domain | ${dut1_node} +| | Create bridge domain | ${dut1_node} | ${bid} | learn=${TRUE} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${dut1_to_tg} | ${bid} | 0 -| | Interface is added to bridge domain | ${dut1_node} +| | Add interface to bridge domain | ${dut1_node} | | ... | ${vhost1} | ${bid} | 0 | | ${vhost_mac}= | Get Vhost User Mac By SW Index | ${dut1_node} | ${vhost2} | | Set test variable | ${dst_vhost_mac} | ${vhost_mac} -| | VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} | ${sock2} +| | Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | ${sock2} | Add IP Neighbors | | [Documentation] diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 1dd9969793..79503d8638 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -31,13 +31,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | LISP | ... -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Vpp All Ra Suppress Link Layer | ${nodes} | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show VAT History On All DUTs | ${nodes} | ... | AND | Show Vpp Settings | ${nodes['DUT1']} | ... | AND | Show Vpp Settings | ${nodes['DUT2']} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Verify VPP PID in Teardown | ... | Documentation | *ip6-lispgpe-ip6 encapsulation test cases* | ... @@ -67,9 +67,9 @@ | | ... | received packets are correct. | | ... | [Ref] RFC6830. | | ... -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -84,18 +84,18 @@ | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} | | And Add IP Neighbors | | And Vpp All RA Suppress Link Layer | ${nodes} -| | When Set up LISP GPE topology +| | When Configure LISP GPE topology in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} | | ... | ${dut1_to_dut2_ip6_static_adjacency} | | ... | ${dut2_to_dut1_ip6_static_adjacency} | | ... | ${dut1_dut2_vni} | ${fib_table_1} -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${tg1_ip6} | ${tg2_ip6} | | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${tg2_ip6} | ${tg1_ip6} | | ... | ${tg_to_dut2} | ${tg_to_dut2_mac} | ${dut2_to_tg_mac} | | ... | ${tg_to_dut1} | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot b/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot index 4cb3686788..9992bb76a3 100644 --- a/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot +++ b/tests/func/policer/eth2p-ethip4-ip4base-ipolicemarkbase-func.robot @@ -15,9 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv4 policer testing -| Test Teardown | Func Test Teardown +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv4 policer test +| Test Teardown | Tear down functional test | Documentation | *IPv4 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ @@ -68,7 +68,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -98,7 +98,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -128,7 +128,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -157,6 +157,6 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp}
\ No newline at end of file diff --git a/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot b/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot index 6a7ae1a306..958607eee4 100644 --- a/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot +++ b/tests/func/policer/eth2p-ethip6-ip6base-ipolicemarkbase-func.robot @@ -15,9 +15,9 @@ | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | Resource | resources/libraries/robot/policer.robot | Library | resources.libraries.python.Trace -| Test Setup | Run Keywords | Func Test Setup -| ... | AND | Setup Topology for IPv6 policer testing -| Test Teardown | Func Test Teardown +| Test Setup | Run Keywords | Set up functional test +| ... | AND | Configure topology for IPv6 policer test +| Test Teardown | Tear down functional test | Documentation | *IPv6 policer test cases* | ... | ... | *[Top] Network topologies:* TG=DUT1 2-node topology with two links\ @@ -68,7 +68,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -98,7 +98,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -128,7 +128,7 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} @@ -156,6 +156,6 @@ | | And Policer Classify Set Interface | ${dut_to_tg_if1} | | And Policer Classify Set Match IP | ${tg_to_dut_if1_ip} | | When Policer Set Configuration -| | Then Send Packet and Verify Marking | ${tg_node} | ${tg_to_dut_if1} +| | Then Send packet and verify marking | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp} diff --git a/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot b/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot index 372940dd82..5a704e83a0 100644 --- a/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot +++ b/tests/func/rpf/eth2p-ethip4-ip4base-rpf-func.robot @@ -21,8 +21,8 @@ | Resource | resources/libraries/robot/traffic.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Source RPF check on IPv4 test cases* | ... | ... | *[Top] Network Topologies:* TG - DUT1 - DUT2 - TG @@ -51,9 +51,9 @@ | | ... | [Cfg] On DUT1 setup IP source check. | | ... | [Ver] Make TG verify matching packets which source address | | ... | is not in routes are dropped. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -70,27 +70,27 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} | | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${pass_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${drop_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} | | ${dut1_to_tg_name}= | Get Interface Name | ${dut1_node} | ${dut1_to_tg} | | When VPP IP Source Check Setup | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${pass_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${dut1_to_tg_ip_GW} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} -| | And Send packet from Port to Port should failed | ${tg_node} +| | And Packet transmission from port to port should fail | ${tg_node} | | ... | ${drop_test_src_ip} | ${test_dst_ip} | ${tg_to_dut1} | | ... | ${tg_to_dut1_mac} | ${dut1_to_tg_mac} | ${tg_to_dut2} | | ... | ${dut1_to_dut2_mac} | ${tg_to_dut2_mac} @@ -101,9 +101,9 @@ | | ... | [Cfg] On DUT1 setup IP source check. | | ... | [Ver] Make TG verify matching packets on non-enabled RPF interface | | ... | are passed. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -120,15 +120,15 @@ | | And Vpp Route Add | | ... | ${dut1_node} | ${pass_test_src_ip} | ${prefix_length} | | ... | ${dut1_to_tg_ip_GW} | ${dut1_to_tg} | resolve_attempts=${NONE} -| | And L2 setup xconnect on DUT +| | And Configure L2XC | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_tg} | | ${dut1_to_tg_name}= | Get Interface Name | ${dut1_node} | ${dut1_to_tg} | | When VPP IP Source Check Setup | ${dut1_node} | ${dut1_to_tg_name} -| | Then Send Packet And Check Headers | ${tg_node} +| | Then Send packet and verify headers | ${tg_node} | | ... | ${test_dst_ip} | ${pass_test_src_ip} | ${tg_to_dut2} | | ... | ${tg_to_dut2_mac} | ${dut1_to_dut2_mac} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${test_dst_ip} | ${dut1_to_tg_ip_GW} | ${tg_to_dut2} | | ... | ${tg_to_dut2_mac} | ${dut1_to_dut2_mac} | ${tg_to_dut1} | | ... | ${dut1_to_tg_mac} | ${tg_to_dut1_mac} diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot index f96ee19b4e..3c98d4a67b 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/map.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Lightweight 4 over 6 test cases* | ... | ... | LW4o6 is a subset of MAP-E, with per-subscriber rules. It uses the @@ -70,10 +70,10 @@ | | ... | IPv4oIPv6 encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor @@ -107,10 +107,10 @@ TC02: Encapsulate IPv4 ICMP into IPv6. IPv6 dst depends on IPv4 addr and ICMP ID | | ... | destination based on ICMP Identifier field. | | ... | [Ref] RFC7596 section 8.1 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor @@ -142,10 +142,10 @@ TC03: Decapsulate IPv4 UDP from IPv6. | | ... | IPv4 non-encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add Arp on DUT @@ -176,10 +176,10 @@ TC04: Hairpinning of traffic between two lwB4 | | ... | encapsulated packet is correct. | | ... | [Ref] RFC7596 RFC7597 | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | And IP addresses are set on interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Add IP Neighbor diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot index 2773980807..c509d5d0cd 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Variables | resources/test_data/softwire/map_e_domains.py | ${5} | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Test for Basic mapping rule for MAP-E*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -71,7 +71,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |=================|===============|================|============|=============|==========|================|==========|==================================| @@ -108,7 +108,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|==================================| @@ -148,7 +148,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|===============|================|============|=============|==========|================|==========|===================================| @@ -206,7 +206,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -223,7 +223,7 @@ # TODO: replace setup when VPP-312 fixed #| | [Setup] | Set Interfaces IP Addresses And Routes | | [Setup] | Run Keywords -| | ... | Func Test Setup | AND +| | ... | Set up functional test | AND | | ... | Set Interfaces IP Addresses And Routes | | [Template] | Check MAP Configuration With Traffic Script # |===================|=========================|================|============|=============|==========|================|==========| @@ -244,10 +244,10 @@ | | ... | [Ver] Send IPv4 to destination in configured domain and receive IPv6\ | | ... | packet. | | ... | [Ref] RFC7597. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -284,10 +284,10 @@ | | ... | [Ver] Send IPv4 encapsulated in IPv6. Source and destination are from\ | | ... | configured domains. Check if VPP translate IPv6 addresses. | | ... | [Ref] RFC7597. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -330,10 +330,10 @@ | | ... | IPv4oIPv6 encapsulated packet is correct. Checks IPv6 destination\ | | ... | based on ICMP Identifier field. | | ... | [Ref] RFC7597 section 8.2. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} @@ -366,10 +366,10 @@ | | ... | [Ver] FIB is not in broken state. The steps are add route, \ | | ... | check with traffic then add same route | | ... | again and check with traffic script. -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | When IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | When Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw} @@ -383,7 +383,7 @@ | | Then Check MAP Configuration With Traffic Script | | ... | 20.0.0.0/8 | 2001::/16 | ${ipv6_br_src} | ${48} | ${6} | ${8} | | ... | 20.169.201.219 | ${1232} | 2001:a9c9:db34::14a9:c9db:34 -| | When IP Addresses Are Set On Interfaces +| | When Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | And Vpp Route Add | ${dut_node} | 2001:: | 16 | ${dut_ip6_gw} @@ -402,10 +402,10 @@ | Bug: VPP-318 | | [Tags] | EXPECTED_FAILING | | [Documentation] | qlen < psid length -| | Given Path For 2-node Testing Is Set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up -| | And IP Addresses Are Set On Interfaces +| | And Set interfaces in 2-node circular topology up +| | And Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Then Run Keyword And Expect Error | Unable to add map domain * @@ -415,10 +415,10 @@ *** Keywords *** | Set Interfaces IP Addresses And Routes -| | Path For 2-node Testing Is Set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces In 2-node Path Are Up -| | IP Addresses Are Set On Interfaces +| | Set interfaces in 2-node circular topology up +| | Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2} @@ -463,7 +463,7 @@ | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show Packet Trace On All DUTs | ${nodes} | AND | | ... | Clear Packet Trace On All DUTs | ${nodes} | AND -| | ... | Check VPP PID in Teardown +| | ... | Verify VPP PID in Teardown | Check Encapsulation With Traffic Script | | [Arguments] | ${ipv4_dst} | ${dst_port} | ${ipv6_dst} diff --git a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot index 2223cd61f9..d3550bcac3 100644 --- a/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot +++ b/tests/func/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot @@ -21,9 +21,9 @@ | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Set interfaces IP addresses and routes -| Test Teardown | Func Test Teardown +| Test Teardown | Tear down functional test | Documentation | *Test for Basic mapping rule for MAP-T*\ | ... | *[Top] Network Topologies:* TG - DUT1 - TG with two links between the | ... | nodes. @@ -78,10 +78,10 @@ *** Keywords *** | Set interfaces IP addresses and routes -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces in 2-node path are up -| | IP addresses are set on interfaces +| | Set interfaces in 2-node circular topology up +| | Configure IP addresses on interfaces | | ... | ${dut_node} | ${dut_to_tg_if1} | ${dut_ip4} | ${ipv4_prefix_len} | | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut_ip6} | ${ipv6_prefix_len} | | Vpp Route Add | ${dut_node} | :: | 0 | ${dut_ip6_gw} | ${dut_to_tg_if2} @@ -132,4 +132,4 @@ | | ... | Map Del Domain | ${dut_node} | ${domain_index} | AND | | ... | Show packet trace on all DUTs | ${nodes} | AND | | ... | Clear packet trace on all DUTs | ${nodes} | AND -| | ... | Check VPP PID in Teardown +| | ... | Verify VPP PID in Teardown diff --git a/tests/func/tap/api-crud-tap-func.robot b/tests/func/tap/api-crud-tap-func.robot index 762c4e3df2..99014a9583 100644 --- a/tests/func/tap/api-crud-tap-func.robot +++ b/tests/func/tap/api-crud-tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface CRUD Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -49,9 +49,9 @@ | | ... | [Cfg] Set two TAP interfaces. | | ... | [Ver] Verify that TAP interface can be modified, deleted, and no other | | ... | TAP interface is affected. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot index 64284e5faf..f7d267f272 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP} | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* @@ -62,26 +62,26 @@ | | ... | [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 Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up | | And Set Interface State | ${dut_node} | ${int2} | up -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_from_TG} | learn=${TRUE} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bid_to_TG} | learn=${TRUE} | | And Linux Add Bridge | ${dut_node} | | ... | ${bid_TAP} | ${tap_int1} | ${tap_int2} -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if1} | ${bid_to_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${int2} | ${bid_from_TG} | 0 -| | And Interface is added to bridge domain | ${dut_node} +| | And Add interface to bridge domain | ${dut_node} | | ... | ${dut_to_tg_if2} | ${bid_from_TG} | 0 -| | Then Send and receive ICMP Packet | ${tg_node} +| | Then Send ICMP packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} diff --git a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot index 8620dd05fd..8b3d25d051 100644 --- a/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot +++ b/tests/func/tap/eth2p-eth-l2bdbasemaclrn-l2shg-eth-2tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -73,9 +73,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should pass. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -98,18 +98,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg2} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Send Ping From Node To Dst | ${dut_node} | ${tap1_NM_ip} | namespace=${namespace2} @@ -125,9 +125,9 @@ | | ... | and assign two linux-TAP interfaces to it respectively. | | ... | [Ver] Packet is sent from TG to both linux-TAP interfaces and reply | | ... | is checked. Ping from First linux-TAP to another should fail. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | ${int2}= | And Add Tap Interface | ${dut_node} | ${tap_int2} | | And Set Interface State | ${dut_node} | ${int1} | up @@ -150,18 +150,18 @@ | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace1} | | And Set Linux Interface ARP | ${dut_node} | ${tap_int2} | | ... | ${tg_ip_address_SHG} | ${tg_to_dut_if1_mac} | ${namespace2} -| | And Bridge domain on DUT node is created | ${dut_node} +| | And Create bridge domain | ${dut_node} | | ... | ${bd_id1} | learn=${TRUE} -| | And Interface is added to bridge domain | ${dut_node} | ${dut_to_tg_if1} +| | And Add interface to bridge domain | ${dut_node} | ${dut_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${int1} +| | And Add interface to bridge domain | ${dut_node} | ${int1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut_node} | ${int2} +| | And Add interface to bridge domain | ${dut_node} | ${int2} | | ... | ${bd_id1} | ${shg1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap1_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address_SHG} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${tap2_NM_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap2_NM_SHG} | ${tg_ip_address_SHG} | | And Run Keyword And Expect Error | Ping Not Successful | Send Ping From Node To Dst diff --git a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot index bd767e704c..7b84a00028 100644 --- a/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot +++ b/tests/func/tap/eth2p-ethip4-ip4base-eth-1tap-func.robot @@ -24,9 +24,9 @@ | Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Run Keywords | Func Test Setup +| Test Setup | Run Keywords | Set up functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} -| Test Teardown | Run Keywords | Func Test Teardown +| Test Teardown | Run Keywords | Tear down functional test | ... | AND | Clean Up Namespaces | ${nodes['DUT1']} | Documentation | *Tap Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links @@ -65,9 +65,9 @@ | | ... | and one is linux-TAP. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -83,7 +83,7 @@ | | ... | ${tg_ip_address} | ${tg_to_dut_if1_mac} | |Â And Add Arp On Dut | ${dut_node} | ${int1} | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} @@ -96,9 +96,9 @@ | | ... | and one is linux-TAP in namespace. | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is | | ... | received on TG. -| | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} | | | And Set Interface Address | | ... | ${dut_node} | ${int1} | ${tap1_VPP_ip} | ${prefix} @@ -118,6 +118,6 @@ | | ... | ${tap1_NM_ip} | ${tap1_NM_mac} | | And Add Route | ${dut_node} | | ... | ${tg_ip_address_GW} | ${prefix} | ${tap1_VPP_ip} | ${namespace1} -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} | | ... | ${tap1_NM_ip} | ${tg_ip_address} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot index 3313f3e399..e5ec8dce9a 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixbase-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv4 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -49,9 +49,9 @@ | | ... | [Ver] Make TG listen for IPFIX template and data packets, verify | | ... | that packet is received and correct. No packets are sent from TG. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -79,9 +79,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -109,9 +109,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -140,9 +140,9 @@ | | ... | for IPFIX template and data packets, verify that IPFIX reported | | ... | the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -173,9 +173,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot index ef2cdf3997..cfa67ee53e 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip4-ip4base-ip4ipfixscale-func.robot @@ -23,8 +23,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING | ... | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv4 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -49,9 +49,9 @@ | | ... | [Ver] Make TG send packets to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packets. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} @@ -81,9 +81,9 @@ | | ... | configured sessions, then listen for IPFIX template and data packets, | | ... | verify that IPFIX reported the received packets for each session. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Add ARP on DUT | ${dut1_node} | ${dut1_to_tg} | ${tg_to_dut1_ip} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot index 7e92174ac7..8557c234d5 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixbase-func.robot @@ -24,8 +24,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv6 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -55,9 +55,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -90,9 +90,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -126,9 +126,9 @@ | | ... | for IPFIX template and data packets, verify that IPFIX reported | | ... | the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -165,9 +165,9 @@ | | ... | [Ver] Make TG send a packet to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packet. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} diff --git a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot index e3a0bc1f4a..ee5caef306 100644 --- a/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot +++ b/tests/func/telemetry/ipfix/eth2p-ethip6-ip6base-ip6ipfixscale-func.robot @@ -25,8 +25,8 @@ | Force Tags | HW_ENV | VM_ENV | 3_NODE_SINGLE_LINK_TOPO | EXPECTED_FAILING | ... | SKIP_VPP_PATCH # TODO: Remove EXPECTED_FAILING tag once functionality is implemented (VPP-204) -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPFIX ipv6 test cases* | ... | ... | IPFIX tests use 3-node topology TG - DUT1 - DUT2 - TG with @@ -55,9 +55,9 @@ | | ... | [Ver] Make TG send packets to DUT1, then listen for IPFIX template | | ... | and data packets, verify that IPFIX reported the received packets. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} @@ -92,9 +92,9 @@ | | ... | configured sessions, then listen for IPFIX template and data packets, | | ... | verify that IPFIX reported the received packets for each session. | | ... | [Ref] RFC 7011 -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1_to_tg_ip} | ${prefix_length} | | And Set Interface Address | ${dut1_node} diff --git a/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot b/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot index d8668835e7..b7929493a5 100644 --- a/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot +++ b/tests/func/telemetry/span/eth2p-ethip4-ip4base-spanrx-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.IPv4Setup | Library | resources.libraries.python.telemetry.SPAN | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *SPAN test suite* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two | ... | links between nodes. @@ -46,9 +46,9 @@ | | ... | [Ver] Make TG send an ARP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ARP reply\ | | ... | on the second interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Set interface Address | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip4} | ${prefix} | | And Set SPAN Mirroring | ${dut_node} | ${dut_to_tg_if1} | ${dut_to_tg_if2} @@ -65,9 +65,9 @@ | | ... | [Ver] Make TG send an ICMP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ICMP reply\ | | ... | on the other interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Set interface Address | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip4} | ${prefix} | | And Add ARP on DUT | ${dut_node} | ${dut_to_tg_if1} | ${tg_to_dut_if1_ip4} diff --git a/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot b/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot index e3acc0362a..1d98bdf722 100644 --- a/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot +++ b/tests/func/telemetry/span/eth2p-ethip6-ip6base-spanrx-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Routing | Library | resources.libraries.python.telemetry.SPAN | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *SPAN test suite* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two | ... | links between nodes. @@ -47,9 +47,9 @@ | | ... | [Ver] Make TG send an ICMP packet to DUT through one interface,\ | | ... | then receive a copy of sent packet and of DUT's ICMP reply\ | | ... | on the other interface. -| | Given Path For 2-node Testing Is Set | ${nodes['TG']} | ${nodes['DUT1']} +| | Given Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['TG']} -| | And Interfaces In 2-node Path Are Up +| | And Set interfaces in 2-node circular topology up | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if1} | | And Vpp Set If Ipv6 Addr | ${dut_node} | ${dut_to_tg_if1} | | ... | ${dut_to_tg_if1_ip6} | ${prefix} diff --git a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot index c235212048..7ac0ec698e 100644 --- a/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot +++ b/tests/func/vhost/eth2p-ethip4-l2bdbase-vhost-client-reconnect-2vm-func.robot @@ -19,10 +19,10 @@ | Resource | resources/libraries/robot/vxlan.robot | Library | resources.libraries.python.Trace | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | VPP_VM_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | ... | resources.libraries.python.QemuUtils.Qemu Kill All | ${dut_node} | AND -| ... | Func Test Teardown +| ... | Tear down functional test | Documentation | *Vhost-User Interface Traffic Tests* | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links | ... | between nodes. @@ -51,9 +51,9 @@ *** Test Cases *** | TC01: Qemu reconnects to VPPs vhost-user when Qemu is killed and restarted -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -90,9 +90,9 @@ | | ... | ${vhost_if3} | | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} | | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} | | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} | | ... | ${2} | | And Check traffic through VM | | When Run keyword | qemu-1.Qemu Kill @@ -107,13 +107,13 @@ | | Then Check traffic through VM -| TC02: VPP reconnects to Qemu vhost-user when VPP is restarted and reconfigured +| TC02: VPP reconnects to Qemu vhost-user when Restart VPP and reconfigured | | [Tags] | EXPECTED_FAILING | | [Documentation] | | ... | *Failing:* Qemu doesn't support reconnect prior to version 2.7. -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -150,15 +150,15 @@ | | ... | ${vhost_if3} | | And Vpp Add L2 Bridge Domain | ${dut_node} | ${104} | ${vxlan4} | | ... | ${vhost_if4} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm1_1} | ${sock_vm1_2} | | ... | ${1} -| | And Setup QEMU Vhost and Run VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} +| | And Configure QEMU vhost and run it VM | ${dut_node} | ${sock_vm2_1} | ${sock_vm2_2} | | ... | ${2} | | And Check traffic through VM -| | And Check VPP PID in Teardown -| | When Setup All Duts ${nodes} +| | And Verify VPP PID in Teardown +| | When Setup All Duts | ${nodes} | | And Save VPP PIDs -| | And Interfaces in 2-node path are up +| | And Set interfaces in 2-node circular topology up | | And Set Interface Address | ${dut_node} | ${dut_to_tg_if1} | ${dut_if1_ip} | | ... | ${prefix_length} | | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if1} | ${tg_if1_ip} @@ -199,7 +199,7 @@ *** Keywords *** -| Setup QEMU Vhost and Run VM +| Configure QEMU vhost and run it VM | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_id} | | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} | | ... | WITH NAME | qemu-${qemu_id} @@ -219,12 +219,12 @@ | Check traffic through VM | | [Documentation] | Send VXLAN traffic through both configured VMs. -| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | Send VXLAN encapsulated packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${101} | | ... | ${dut_if1_ip} | ${tg_if1_ip} | ${102} -| | Send VXLAN receive VXLAN Packet | ${tg_node} +| | Send VXLAN encapsulated packet and verify received packet | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_if1_ip} | ${dut_if1_ip} | ${103} diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot index c48d2ca45c..249e0dea33 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2bdbasemaclrn-vlantrans21-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - transalte-2-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -68,30 +68,30 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -109,31 +109,31 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -150,30 +150,30 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -192,30 +192,30 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot index bf65f87acb..f3643be8bb 100644 --- a/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot +++ b/tests/func/vlan/eth2p-dot1ad--dot1q-l2xcbase-vlantrans21-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -65,23 +65,23 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -99,24 +99,24 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -132,23 +132,23 @@ | | ... | tagegd with Dot1ad tags from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -167,23 +167,23 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot index 48edbd54f9..6efc508423 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2bdbasemaclrn-vlantrans22-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-2-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -68,33 +68,33 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -111,34 +111,34 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -155,34 +155,34 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -199,34 +199,34 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -241,33 +241,33 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -285,34 +285,34 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -329,34 +329,34 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -373,33 +373,33 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot index 617447666a..488f9fa822 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2 cross-connect with QinQ test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology with @@ -53,17 +53,17 @@ | | ... | Make TG send ICMPv4 Echo Req in both directions between two of | | ... | its interfaces to be switched by DUT1 and DUT2; verify all | | ... | packets are received. [Ref] IEEE 802.1ad. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1_node} | ${subif_index_1} | ${dut2_node} | ${subif_index_2} | | ... | ${tag_rewrite_method} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_tg} | ${subif_index_1} | | ... | ${dut2_node} | ${dut2_to_tg} | ${subif_index_2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot index b96f291b97..c646cbcd03 100644 --- a/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot +++ b/tests/func/vlan/eth2p-dot1ad-l2xcbase-vlantrans22-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-2-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -65,26 +65,26 @@ | | ... | tagged with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -101,27 +101,27 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -138,27 +138,27 @@ | | ... | one method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -175,27 +175,27 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -210,26 +210,26 @@ | | ... | tagegd with Dot1ad tags from one of its interfaces to another one | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1ad | vlan1=${outer_vlan_id1} | | ... | vlan2=${inner_vlan_id1} @@ -247,27 +247,27 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -284,27 +284,27 @@ | | ... | one method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} @@ -321,26 +321,26 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Tagged Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create tagged sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id1} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-2-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1ad | | ... | vlan1=${outer_vlan_id1} | vlan2=${inner_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot index 6f61c7880b..b5fbb41138 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2bdbasemaclrn-vlantrans12-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -70,31 +70,31 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -112,32 +112,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links @@ -154,32 +154,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC04: DUT1 and DUT2 with L2BD and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links @@ -196,32 +196,32 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC05: DUT1 and DUT2 with L2BD and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links @@ -236,31 +236,31 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -278,32 +278,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -321,32 +321,32 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -364,31 +364,31 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot index c886247fba..bd1cebfd1e 100644 --- a/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot +++ b/tests/func/vlan/eth2p-dot1q--dot1ad-l2xcbase-vlantrans12-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-2* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,24 +67,24 @@ | | ... | tagged with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -102,25 +102,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer tag used (DUT1) switch ICMPv4 between two TG links @@ -137,25 +137,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id1} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC04: DUT1 and DUT2 with L2XC and VLAN translate-1-2 with wrong outer and inner tag used (DUT1) switch ICMPv4 between two TG links @@ -172,25 +172,25 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id1} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC05: DUT1 and DUT2 with L2XC and VLAN translate-1-2 (DUT1) switch ICMPv6 between two TG links @@ -205,24 +205,24 @@ | | ... | tagegd with one Dot1q tag from one of its interfaces to another one | | ... | via DUT1 and DUT2; verify that packet is received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -240,25 +240,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_id2} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -276,25 +276,25 @@ | | ... | via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -312,24 +312,24 @@ | | ... | to another one via DUT1 and DUT2; verify that packet is not received. | | ... | [Ref] IEEE 802.1q, IEEE 802.1ad | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Tagged Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create tagged sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${subid} | | ... | outer_vlan_id=${outer_vlan_id2} | inner_vlan_id=${inner_vlan_id2} | | ... | type_subif=two_tags dot1ad -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-2 | push_dot1q=${False} | | ... | tag1_id=${outer_vlan_wrong} | tag2_id=${inner_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-2 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot index 5398574848..19247b00ce 100644 --- a/tests/func/vlan/eth2p-dot1q-ip4base-func.robot +++ b/tests/func/vlan/eth2p-dot1q-ip4base-func.robot @@ -20,8 +20,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Util | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *IPv4 with VLAN subinterfaces* | ... | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology @@ -48,7 +48,7 @@ *** Test Cases *** | TC01: Process untagged send tagged | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net0_2} | ${ip4_net2_2} | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} @@ -58,7 +58,7 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net0_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1} | | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if1_mac} @@ -68,13 +68,13 @@ # It doesn't work with virtio | | [Tags] | EXPECTED_FAILING | | Given Vlan Test Setup -| | Then Send Packet And Check Headers +| | Then Send packet and verify headers | | ... | ${tg_node} | ${ip4_net1_2} | ${ip4_net2_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} | | ... | encaps_tx=Dot1q | vlan_tx=${tag_1} | | ... | encaps_rx=Dot1q | vlan_rx=${tag_2} -| | And Send Packet And Check Headers +| | And Send packet and verify headers | | ... | ${tg_node} | ${ip4_net2_2} | ${ip4_net1_2} | ${tg_to_dut_if2} | | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2} | | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac} @@ -83,13 +83,13 @@ *** Keywords *** | Vlan Test Setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Interfaces in 2-node path are up +| | Set interfaces in 2-node circular topology up | | -| | ${vlan1_name} | ${vlan1_index}= | Vlan Subinterface Created +| | ${vlan1_name} | ${vlan1_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_1} -| | ${vlan2_name} | ${vlan2_index}= | Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tag_2} | | | | Set Interface Address | ${dut_node} diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index e2f0e3d9fd..28ab67b266 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,11 +21,11 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_DOUBLE_LINK_TOPO | HW_ENV | VM_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup +| Test Setup | Set up functional test | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} | ... | AND | Show vpp trace dump on all DUTs -| ... | AND | Stop and Clear QEMU | ${dut_node} | ${vm_node} -| ... | AND | Check VPP PID in Teardown +| ... | AND | Stop and clear QEMU | ${dut_node} | ${vm_node} +| ... | AND | Verify VPP PID in Teardown | Documentation | *L2 bridge domain with VLAN tag over VM test cases* | ... | ... | *[Top] Network Topologies:* TG=DUT 2-node circular topology @@ -74,29 +74,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 2-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip4_1} | ${ip4_2} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q -| | And Send and receive ICMP Packet +| | And Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip4_2} | ${ip4_1} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q @@ -114,29 +114,29 @@ | | ... | that packet is received. | | ... | [Ref] IEEE 802.1q | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Interfaces in 2-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 2-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${vlan_id1} -| | And VPP Vhost interfaces for L2BD forwarding are setup +| | And Configure vhost interfaces for L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And VM for Vhost L2BD forwarding is setup +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if1} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut_node} | ${vlan2_index} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut_node} | ${vhost_if2} +| | And Add interface to bridge domain | ${dut_node} | ${vhost_if2} | | ... | ${bd_id2} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | ${ip6_1} | ${ip6_2} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q -| | And Send and receive ICMP Packet +| | And Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1} | ${ip6_2} | ${ip6_1} | | ... | encaps=Dot1q | vlan1=${vlan_id1} | encaps_rx=Dot1q diff --git a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot index c122dbdbcb..379d9a4ab6 100644 --- a/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2bdbasemaclrn-vlantrans11-func.robot @@ -19,8 +19,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with VLAN tag rewrite test cases - translate-1-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -67,28 +67,28 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -105,29 +105,29 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2BD and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links @@ -141,28 +141,28 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip6} | | ... | dst_ip=${dst_ip6} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -179,28 +179,28 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_dut2} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_dut2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${vlan1_index} +| | And Add interface to bridge domain | ${dut1_node} | ${vlan1_index} | | ... | ${bd_id1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg} +| | And Create bridge domain | ${dut2_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut2_node} | ${vlan2_index} +| | And Add interface to bridge domain | ${dut2_node} | ${vlan2_index} | | ... | ${bd_id1} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip6} | dst_ip=${dst_ip6} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot index cccd89edea..bb91940a32 100644 --- a/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot +++ b/tests/func/vlan/eth2p-dot1q-l2xcbase-vlantrans11-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2XC with VLAN tag rewrite test cases - translate-1-1* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -61,21 +61,21 @@ | | ... | method. [Ver] Make TG send ICMPv4 Echo Req tagged with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} @@ -91,22 +91,22 @@ | | ... | tag from one of its interfaces to another one via DUT1 and DUT2; | | ... | verify that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | encaps=Dot1q | vlan1=${outer_vlan_id1} | TC03: DUT1 and DUT2 with L2XC and VLAN translate-1-1 (DUT1) switch ICMPv6 between two TG links @@ -120,21 +120,21 @@ | | ... | method. [Ver] Make TG send ICMPv6 Echo Req tagegd with one Dot1q tag | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is received. [Ref] IEEE 802.1q -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} -| | Then Send and receive ICMP Packet +| | Then Send ICMP packet and verify received packet | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} | src_ip=${src_ip} | | ... | dst_ip=${dst_ip} | encaps=Dot1q | vlan1=${outer_vlan_id1} @@ -151,21 +151,21 @@ | | ... | from one of its interfaces to another one via DUT1 and DUT2; verify | | ... | that packet is not received. [Ref] IEEE 802.1q | | [Tags] | SKIP_PATCH -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | ${vlan1_name} | ${vlan1_index}= | When Vlan Subinterface Created +| | And Set interfaces in 3-node circular topology up +| | ${vlan1_name} | ${vlan1_index}= | When Create vlan sub-interface | | ... | ${dut1_node} | ${dut1_to_tg} | ${outer_vlan_id1} -| | ${vlan2_name} | ${vlan2_index}= | And Vlan Subinterface Created +| | ${vlan2_name} | ${vlan2_index}= | And Create vlan sub-interface | | ... | ${dut2_node} | ${dut2_to_dut1} | ${outer_vlan_id2} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut1_node} +| | And Configure L2 tag rewrite method on interface | ${dut1_node} | | ... | ${vlan1_index} | translate-1-1 | tag1_id=${outer_vlan_wrong} -| | And L2 Tag Rewrite Method Is Set On Interface | ${dut2_node} +| | And Configure L2 tag rewrite method on interface | ${dut2_node} | | ... | ${vlan2_index} | pop-1 -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1_node} | ${dut1_to_dut2} | ${vlan1_index} | | ... | ${dut2_node} | ${dut2_to_tg} | ${vlan2_index} | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMP Packet | ${tg_node} | ${tg_to_dut1} +| | ... | Send ICMP packet and verify received packet | ${tg_node} | ${tg_to_dut1} | | ... | ${tg_to_dut2} | src_ip=${src_ip} | dst_ip=${dst_ip} | encaps=Dot1q | | ... | vlan1=${outer_vlan_id1} diff --git a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot index d34eff2537..841077203b 100644 --- a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Vpn routed forwarding - baseline IPv4* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. @@ -71,15 +71,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if1 and from | | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} +| | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} +| | And Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2} | ${tg_dut1_ip2} | 5 @@ -94,15 +94,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if1 and from | | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | 5 @@ -117,15 +117,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if1 and from | | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | 5 @@ -140,15 +140,15 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if1 and from | | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | 5 -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | 5 @@ -163,16 +163,16 @@ | | ... | with one route. | | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if1 and from | | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac} | | ... | ${tg_to_dut2_if1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} @@ -189,13 +189,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | 5 @@ -212,13 +212,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT1->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | 5 @@ -235,13 +235,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->DUT1-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | 5 @@ -258,13 +258,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to DUT2->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | 5 @@ -281,13 +281,13 @@ | | ... | [Ver] Packet is send from TG->DUT1-if1 to TG->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} diff --git a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot index eda02a7161..64a34c4458 100644 --- a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot @@ -22,8 +22,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPUtil | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Vpn routed forwarding - baseline IPv6* | ... | *[Top] Network Topologies:* TG=DUT1=DUT2=TG 3-node topology with two | ... | links in between nodes. @@ -71,16 +71,16 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if1 and from | | ... | TG->DUT1-if2 to DUT1->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} +| | Then Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if1} | ${dut1_to_tg_if1_mac} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_ip1} | | ... | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} +| | And Send ICMP echo request and verify answer | ${tg_node} | | ... | ${tg_to_dut1_if2} | ${dut1_to_tg_if2_mac} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_ip2} | | ... | ${tg_dut1_ip2} | ${timeout} @@ -96,15 +96,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if1 and from | | ... | TG->DUT1-if2 to DUT1->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -119,15 +119,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if1 and from | | ... | TG->DUT1-if2 to DUT2->DUT1-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -142,15 +142,15 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if1 and from | | ... | TG->DUT1-if2 to DUT2->TG-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if1} +| | Then Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip1} | ${timeout} -| | And Node replies to ICMP echo request | ${tg_node} | ${tg_to_dut1_if2} +| | And Send ICMP echo request and verify answer | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip2} | ${timeout} @@ -165,16 +165,16 @@ | | ... | configured with just one route. | | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if1 and from | | ... | TG->DUT1-if2 to TG->DUT2-if2 and checked if arrived. -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node -| | Then Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | Then Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if1} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if1} | ${dut2_to_tg_if1_mac} | | ... | ${tg_to_dut2_if1_mac} -| | And Send Packet And Check Headers | ${tg_node} +| | And Send packet and verify headers | ${tg_node} | | ... | ${tg_dut1_ip2} | ${tg_dut2_ip2} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} @@ -191,18 +191,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -219,18 +219,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT1->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut1_to_dut2_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut1_to_dut2_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -248,18 +248,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->DUT1-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_dut1_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_dut1_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -276,18 +276,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to DUT2->TG-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if1} | | ... | ${dut1_to_tg_if1_mac} | ${tg_to_dut1_if1_mac} | | ... | ${dut2_to_tg_ip2} | ${tg_dut1_ip1} | ${timeout} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Node replies to ICMP echo request +| | ... | Send ICMP echo request and verify answer | | ... | ${tg_node} | ${tg_to_dut1_if2} | | ... | ${dut1_to_tg_if2_mac} | ${tg_to_dut1_if2_mac} | | ... | ${dut2_to_tg_ip1} | ${tg_dut1_ip2} | ${timeout} @@ -304,18 +304,18 @@ | | ... | [Ver] Packet is sent from TG->DUT1-if1 to TG->DUT2-if2 where it | | ... | should not arrive. | | [Tags] | SKIP_PATCH -| | Given Path for Double-Link 3-node testing is set +| | Given Configure path in double-link 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in Double-Link 3-node path are UP +| | And Set interfaces in double-link 3-node circular topology up | | When Setup Env - 2xVRF Each Node | | Then Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip1} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip1} | | ... | ${tg_dut2_ip2} | ${tg_to_dut1_if1} | | ... | ${tg_to_dut1_if1_mac} | ${dut1_to_tg_if1_mac} | ${tg_to_dut2_if2} | | ... | ${dut2_to_tg_if2_mac} | ${tg_to_dut2_if2_mac} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send Packet And Check Headers | ${tg_node} | ${tg_dut1_ip2} +| | ... | Send packet and verify headers | ${tg_node} | ${tg_dut1_ip2} | | ... | ${tg_dut2_ip1} | ${tg_to_dut1_if2} | | ... | ${tg_to_dut1_if2_mac} | ${dut1_to_tg_if2_mac} | ${tg_to_dut2_if1} | | ... | ${dut2_to_tg_if1_mac} | ${tg_to_dut2_if1_mac} diff --git a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot index 592154845d..0155b4953d 100644 --- a/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-dot1qip4vxlan-l2bdbasemaclrn-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC7348 VXLAN: Bridge-domain with VXLAN over VLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology with @@ -51,26 +51,26 @@ | | ... | interface to TG and one VXLAN tunnel interface towards the other DUT | | ... | over VLAN sub-interface. [Ver] Make TG send ICMPv4 Echo Req between | | ... | two of its interfaces, verify all packets are received. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | And Vlan interfaces for VXLAN are created | ${VLAN} +| | And Set interfaces in 3-node circular topology up +| | And Create vlan interfaces for VXLAN | ${VLAN} | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces +| | And Configure IP addresses and neighbors on interfaces | | ... | ${dut1_node} | ${dut1s_vlan_name} | ${dut1s_vlan_index} | | ... | ${dut2_node} | ${dut2s_vlan_name} | ${dut2s_vlan_index} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} | | And Set Interface State | ${dut1_node} | ${dut1s_vxlan} | | ... | up -| | And Interfaces are added to BD | ${dut1_node} | ${BID} +| | And Add interfaces to L2BD | ${dut1_node} | ${BID} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan} | | ... | up -| | And Interfaces are added to BD | ${dut2_node} | ${BID} +| | And Add interfaces to L2BD | ${dut2_node} | ${BID} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 5e277a3200..b69abb09d5 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -20,11 +20,11 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV | VPP_VM_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown -| ... | AND | Run keyword | Qemu Teardown | ${dut1_node} +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ... | ${${qemu1}} | ${qemu1} -| ... | AND | Run keyword | Qemu Teardown | ${dut2_node} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ... | ${${qemu2}} | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv4* | ... @@ -77,22 +77,22 @@ | | ... | be switched by DUT1 and DUT2; verify packets are switched between | | ... | these TG interfaces. | | ... | [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node} +| | And Set interfaces in 3-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut1_vhost1} | | ... | ${dut1_vhost2} -| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut2_vhost1} | | ... | ${dut2_vhost2} -| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | | ... | ${sock2} | ${qemu1} -| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1} | | ... | ${sock2} | ${qemu2} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} @@ -104,13 +104,13 @@ | | | ... | ${ip4_addr1} | ${ip4_addr2} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip4_addr2} | ${ip4_addr1} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${${dut1_vhost1}} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2} | | ... | ${dut1s_vxlan} | ${${dut1_vhost2}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${${dut2_vhost1}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2} | | ... | ${dut2s_vxlan} | ${${dut2_vhost2}} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot index 543fec22b8..6db2ee27ff 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2bdbasemaclrn-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Bridge-domain with VXLAN test cases - IPv4* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -59,20 +59,20 @@ | | ... | configure two i/fs into L2BD with MAC learning. [Ver] Make TG | | ... | verify ICMPv4 Echo Req pkts are switched thru DUT1 and DUT2 in | | ... | both directions and are correct on receive. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot index de38c56b2d..70f17bc368 100644 --- a/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot +++ b/tests/func/vxlan/eth2p-ethip4vxlan-l2xcbase-func.robot @@ -18,8 +18,8 @@ | Resource | resources/libraries/robot/l2_traffic.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *RFC7348 VXLAN: L2 cross-connect with VXLAN test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -47,20 +47,20 @@ | | ... | interface to TG and one VXLAN tunnel interface towards the other | | ... | DUT. [Ver] Make TG send ICMPv4 Echo Req between two of its | | ... | interfaces; verify all packets are received. [Ref] RFC7348. -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | ${dut1_to_dut2_name}= | Get interface name | ${dut1_node} | ${dut1_to_dut2} | | ${dut2_to_dut1_name}= | Get interface name | ${dut2_node} | ${dut2_to_dut1} -| | And IP addresses are set on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} +| | And Configure IP addresses and neighbors on interfaces | ${dut1_node} | ${dut1_to_dut2_name} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1_name} | ${NONE} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} -| | And Interfaces are added to xconnect | ${dut1_node} +| | And Add interfaces to L2XC | ${dut1_node} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} -| | And Interfaces are added to xconnect | ${dut2_node} +| | And Add interfaces to L2XC | ${dut2_node} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv4 bidirectionally +| | Then Send ICMPv4 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot index 6e1e6e8dcb..429d9a3353 100644 --- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot +++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-eth-2vhost-1vm-func.robot @@ -21,11 +21,11 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Run Keywords | Func Test Teardown -| ... | AND | Run keyword | Qemu Teardown | ${dut1_node} +| Test Setup | Set up functional test +| Test Teardown | Run Keywords | Tear down functional test +| ... | AND | Run keyword | Tear down QEMU | ${dut1_node} | ... | ${${qemu1}} | ${qemu1} -| ... | AND | Run keyword | Qemu Teardown | ${dut2_node} +| ... | AND | Run keyword | Tear down QEMU | ${dut2_node} | ... | ${${qemu2}} | ${qemu2} | Documentation | *L2BD with VM combined with VXLAN test cases - IPv6* | ... @@ -79,22 +79,22 @@ | | ... | these TG interfaces. | | ... | [Ref] RFC7348. | | [Tags] | VPP_VM_ENV -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up -| | When VPP Vhost interfaces for L2BD forwarding are setup | ${dut1_node} +| | And Set interfaces in 3-node circular topology up +| | When Configure vhost interfaces for L2BD forwarding | ${dut1_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut1_vhost1} | | ... | ${dut1_vhost2} -| | And VPP Vhost interfaces for L2BD forwarding are setup | ${dut2_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut2_node} | | ... | ${sock1} | | ... | ${sock2} | | ... | ${dut2_vhost1} | | ... | ${dut2_vhost2} -| | And VM for Vhost L2BD forwarding is setup | ${dut1_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut1_node} | ${sock1} | | ... | ${sock2} | ${qemu1} -| | And VM for Vhost L2BD forwarding is setup | ${dut2_node} | ${sock1} +| | And Configure VM for vhost L2BD forwarding | ${dut2_node} | ${sock1} | | ... | ${sock2} | ${qemu2} | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} @@ -107,13 +107,13 @@ | | | ... | ${ip6_addr1} | ${ip6_addr2} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip6_addr2} | ${ip6_addr1} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${${dut1_vhost1}} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id2} | | ... | ${dut1s_vxlan} | ${${dut1_vhost2}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${${dut2_vhost1}} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id2} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id2} | | ... | ${dut2s_vxlan} | ${${dut2_vhost2}} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot index 4e03dd517d..f817baa3a6 100644 --- a/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot +++ b/tests/func/vxlan/eth2p-ethip6vxlan-l2bdbasemaclrn-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *Bridge-domain with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG-DUT1-DUT2-TG 3-node circular topology @@ -58,9 +58,9 @@ | | ... | interfaces to be switched by DUT1 and DUT2; verify all packets | | ... | are received. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node testing is set +| | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} -| | And Interfaces in 3-node path are up +| | And Set interfaces in 3-node circular topology up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -70,11 +70,11 @@ | | And Vpp All RA Suppress Link Layer | ${nodes} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${vni_1} | | | ... | ${ip6_addr1} | ${ip6_addr2} -| | And Interfaces are added to BD | ${dut1_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut1_node} | ${bd_id1} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${vni_1} | | | ... | ${ip6_addr2} | ${ip6_addr1} -| | And Interfaces are added to BD | ${dut2_node} | ${bd_id1} +| | And Add interfaces to L2BD | ${dut2_node} | ${bd_id1} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} -| | Then Send and receive ICMPv6 bidirectionally +| | Then Send ICMPv6 bidirectionally and verify received packets | | ... | ${tg_node} | ${tg_to_dut1} | ${tg_to_dut2} diff --git a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot index 8afb22a717..8ae7286583 100644 --- a/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/vxlan/eth4p-ethip4vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -20,8 +20,8 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Library | resources.libraries.python.Trace | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with SHG combined with VXLAN test cases - IPv4* | ... | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -67,10 +67,10 @@ | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1. | | ... | [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2} @@ -91,39 +91,39 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv4 bidirectionally +| | ... | Send ICMPv4 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} @@ -140,10 +140,10 @@ | | ... | to be switched by DUT1 and DUT2; verify packets are switched between | | ... | all TG interfaces. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip4_addr1} | | ... | ${ip4_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip4_addr2} @@ -164,37 +164,37 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv4 bidirectionally | ${tg_node} +| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv4 bidirectionally | ${tg_node} +| | And Send ICMPv4 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut2_if1} | | ... | ${tg_to_dut2_if2} diff --git a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot index 512d94361f..e4dec5bd1e 100644 --- a/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot +++ b/tests/func/vxlan/eth4p-ethip6vxlan-l2bdbasemaclrn-l2shg-func.robot @@ -21,8 +21,8 @@ | Library | resources.libraries.python.Trace | Library | resources.libraries.python.IPv6Setup | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV -| Test Setup | Func Test Setup -| Test Teardown | Func Test Teardown +| Test Setup | Set up functional test +| Test Teardown | Tear down functional test | Documentation | *L2BD with SHG combined with VXLAN test cases - IPv6* | ... | ... | *[Top] Network topologies:* TG=DUT1=DUT2=TG 3-node circular topology @@ -68,10 +68,10 @@ | | ... | TG interfaces connected to DUT2 that are isolated by SHG on DUT1. | | ... | [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -93,39 +93,39 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg1} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send and receive ICMPv6 bidirectionally +| | ... | Send ICMPv6 bidirectionally and verify received packets | | | ... | ${tg_node} | ${tg_to_dut2_if1} | | | ... | ${tg_to_dut2_if2} @@ -142,10 +142,10 @@ | | ... | to be switched by DUT1 and DUT2; verify packets are switched between | | ... | all TG interfaces. [Ref] RFC7348. | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO -| | Given Path for 3-node BD-SHG testing is set | ${nodes['TG']} +| | Given Configure path for 3-node BD-SHG test | ${nodes['TG']} | | ... | ${nodes['DUT1']} | | ... | ${nodes['DUT2']} -| | And Interfaces in 3-node BD-SHG testing are up +| | And Set interfaces in 3-node BD-SHG test up | | And Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${ip6_addr1} | | ... | ${ip6_prefix} | | And Set Interface Address | ${dut2_node} | ${dut2_to_dut1} | ${ip6_addr2} @@ -167,37 +167,37 @@ | | And Set Interface State | ${dut2_node} | ${dut2s_vxlan2} | up | | And Vpp Node Interfaces Ready Wait | ${dut1_node} | | And Vpp Node Interfaces Ready Wait | ${dut2_node} -| | And Bridge domain on DUT node is created | ${dut1_node} | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} +| | And Create bridge domain | ${dut1_node} | ${bd_id1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if1} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1_to_tg_if2} | | ... | ${bd_id1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan1} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan1} | | ... | ${bd_id1} | ${shg1} -| | And Interface is added to bridge domain | ${dut1_node} | ${dut1s_vxlan2} +| | And Add interface to bridge domain | ${dut1_node} | ${dut1s_vxlan2} | | ... | ${bd_id1} | ${shg2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} +| | And Create bridge domain | ${dut2_node} | ${bd_id2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if1} | | ... | ${bd_id2} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan1} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan1} | | ... | ${bd_id2} -| | And Bridge domain on DUT node is created | ${dut2_node} | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} +| | And Create bridge domain | ${dut2_node} | ${bd_id3} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2_to_tg_if2} | | ... | ${bd_id3} -| | And Interface is added to bridge domain | ${dut2_node} | ${dut2s_vxlan2} +| | And Add interface to bridge domain | ${dut2_node} | ${dut2s_vxlan2} | | ... | ${bd_id3} -| | Then Send and receive ICMPv6 bidirectionally | ${tg_node} +| | Then Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if1} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if1} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut1_if2} | | ... | ${tg_to_dut2_if2} -| | And Send and receive ICMPv6 bidirectionally | ${tg_node} +| | And Send ICMPv6 bidirectionally and verify received packets | ${tg_node} | | ... | ${tg_to_dut2_if1} | | ... | ${tg_to_dut2_if2} diff --git a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot index 351fe1d9da..b55f91a177 100644 --- a/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1vic1227-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Cisco-VIC-1227 | ETH | L2BDMACLRN | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Cisco-VIC-1227 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2BD test cases* @@ -69,11 +69,11 @@ | | Set Test Documentation | [Ver] Find NDR for ${framesize} Byte\ | append=True | | Set Test Documentation | frames using binary search start at\ | append=True | | Set Test Documentation | 10GE linerate, step ${threshold}pps. | append=True -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology -| | Run Keyword If | ${framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology +| | Run Keyword If | ${framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -95,11 +95,11 @@ | | Set Test Documentation | 10GE linerate, step ${threshold}pps, | append=True | | Set Test Documentation | LT=${perf_pdr_loss_acceptance} | append=True | | Set Test Documentation | ${perf_pdr_loss_acceptance_type}. | append=True -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology -| | Run Keyword If | ${framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology +| | Run Keyword If | ${framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot index 517905d640..c61b165d66 100644 --- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrchk.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput L2XC with 802.1ad verify test cases* | ... @@ -64,18 +64,18 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.0mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -89,18 +89,18 @@ | | [Tags] | 1514B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1514} | | ${rate}= | Set Variable | 810635pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -114,17 +114,17 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138458pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -138,18 +138,18 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 8.5mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -163,18 +163,18 @@ | | [Tags] | 1514B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1514} | | ${rate}= | Set Variable | 810635pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -188,17 +188,17 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138458pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -212,18 +212,18 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 8.6mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -237,18 +237,18 @@ | | [Tags] | 1514B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1514} | | ${rate}= | Set Variable | 810635pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -262,17 +262,17 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138458pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot index cafae94722..a43feb2afc 100644 --- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2XC with 802.1ad test cases* @@ -73,18 +73,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -103,18 +103,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -134,18 +134,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -164,18 +164,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -195,17 +195,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -224,17 +224,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -254,18 +254,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -284,18 +284,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -315,18 +315,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -345,18 +345,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -376,17 +376,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -405,17 +405,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -435,18 +435,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -465,18 +465,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -496,18 +496,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -526,18 +526,18 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -557,17 +557,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -586,17 +586,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} | | ... | ${outer_vlan_id} | ${inner_vlan_id} | ${type_subif} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot index 245f969970..c1590da2dd 100644 --- a/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | DOT1Q | L2BDMACLRN | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -88,17 +88,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -122,17 +122,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -157,17 +157,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -191,17 +191,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -228,17 +228,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -264,17 +264,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -299,17 +299,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -333,17 +333,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -368,17 +368,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -402,17 +402,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -439,17 +439,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -475,17 +475,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -510,17 +510,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -544,17 +544,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -579,17 +579,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -613,17 +613,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -650,17 +650,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -686,17 +686,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} | | ... | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot index 75b9c36f9e..250685adc7 100644 --- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | DOT1Q | L2XCFWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -85,16 +85,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -118,16 +118,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -152,16 +152,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -185,16 +185,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -221,16 +221,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -256,16 +256,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -290,16 +290,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -323,16 +323,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -357,16 +357,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -390,16 +390,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -426,16 +426,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -461,16 +461,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -495,16 +495,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -528,16 +528,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -562,16 +562,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -595,16 +595,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -631,16 +631,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -666,16 +666,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology | | ... | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot index cf1fddff23..c0c310d9ca 100644 --- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrchk.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput L2XC with 802.1q verify test cases* | ... @@ -60,17 +60,17 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.0mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -84,17 +84,17 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 720000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -108,16 +108,16 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -131,17 +131,17 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 8.7mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -155,17 +155,17 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 720000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -179,16 +179,16 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -202,17 +202,17 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.3mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -226,17 +226,17 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 720000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} @@ -250,16 +250,16 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} diff --git a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot index 77edc2adc9..397783176f 100644 --- a/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-dot1q-l2xcbase-ndrpdrdisc.robot @@ -17,13 +17,13 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1Q -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2XC with 802.1q test cases* @@ -69,17 +69,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -98,17 +98,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -128,17 +128,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -157,17 +157,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -187,16 +187,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -215,16 +215,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -244,17 +244,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -273,17 +273,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -303,17 +303,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -332,17 +332,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -362,16 +362,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -390,16 +390,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -419,17 +419,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -448,17 +448,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -478,17 +478,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -507,17 +507,17 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -537,16 +537,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -565,16 +565,16 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And VPP interfaces in path are up in a 3-node circular topology -| | When VLAN dot1q subinterfaces initialized on 3-node topology +| | And Set interfaces in path in 3-node circular topology up +| | When Initialize VLAN dot1q sub-interfaces in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | And L2 tag rewrite method setup on interfaces +| | And Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | And Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect +| | And Connect interfaces and VLAN sub-interfaces using L2XC | | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} | | ... | ${dut2} | ${dut2_if2} | ${subif_index_2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot index 07b7ff93a1..da41944461 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -81,16 +81,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -111,16 +111,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -142,16 +142,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -172,16 +172,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -204,16 +204,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -235,16 +235,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -266,16 +266,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -296,16 +296,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -327,16 +327,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -357,16 +357,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -389,16 +389,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -420,16 +420,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -451,16 +451,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -481,16 +481,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -512,16 +512,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -542,16 +542,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -574,16 +574,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -605,16 +605,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot index 0580a94937..695d1c1275 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot @@ -16,13 +16,13 @@ | Library | resources.libraries.python.QemuUtils | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | VHOST | VM -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown -| Test Setup | Setup all DUTs before test +| Suite Teardown | Tear down 3-node performance topology +| Test Setup | Configure all DUTs before test | Test Teardown | Run Keywords | ... | Show Bridge Domain Data On All DUTs -| ... | AND | Performance test with vhost and VM with dpdk-testpmd teardown +| ... | AND | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} @@ -81,12 +81,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -107,12 +107,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -134,12 +134,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -160,12 +160,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -188,12 +188,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -215,12 +215,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -242,12 +242,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -268,12 +268,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -295,12 +295,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -321,12 +321,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -349,12 +349,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -376,12 +376,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -403,12 +403,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -429,12 +429,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -456,12 +456,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -482,12 +482,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -510,12 +510,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -537,12 +537,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot index df91ca58df..9b4e66cde3 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrchk.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput L2BD verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.9mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -74,11 +74,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -90,10 +90,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -105,11 +105,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -121,11 +121,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -137,10 +137,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -152,11 +152,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -168,11 +168,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -184,9 +184,9 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot index 7372905ecf..cf3ea9cafa 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2BD test cases* @@ -62,12 +62,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -80,12 +80,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot index 60feba06f1..1b5a8be124 100644 --- a/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2bdbasemaclrn-pdrchk.robot @@ -18,11 +18,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | ETH | L2BDMACLRN | BASE | L2BDBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput L2BD verify test cases* @@ -64,12 +64,12 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot index a4054a0278..66b09477e7 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -79,16 +79,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -109,16 +109,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -140,16 +140,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -170,16 +170,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -202,16 +202,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -233,16 +233,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -264,16 +264,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -294,16 +294,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -325,16 +325,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -355,16 +355,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -387,16 +387,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -418,16 +418,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -449,16 +449,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -479,16 +479,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -510,16 +510,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -540,16 +540,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -572,16 +572,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -603,16 +603,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot index eeb89fca92..a44f8dd340 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} @@ -82,12 +82,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -108,12 +108,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -135,12 +135,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -161,12 +161,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -189,12 +189,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -216,12 +216,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -243,12 +243,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -269,12 +269,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -296,12 +296,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -322,12 +322,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -350,12 +350,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -377,12 +377,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -404,12 +404,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -430,12 +430,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -457,12 +457,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -483,12 +483,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -511,12 +511,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -538,12 +538,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot index d571dcc4cc..7f90967ce4 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrchk.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput L2XC verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 5.9mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -74,11 +74,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -90,10 +90,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -105,11 +105,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -121,11 +121,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -137,10 +137,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -152,11 +152,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -168,11 +168,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -184,9 +184,9 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot index ee0d47c1d8..8407ed4a11 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2XC test cases* @@ -67,11 +67,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -88,11 +88,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -110,11 +110,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -131,11 +131,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -153,10 +153,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -173,10 +173,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -194,11 +194,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -215,11 +215,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -237,11 +237,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -258,11 +258,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -280,10 +280,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -300,10 +300,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -321,11 +321,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -342,11 +342,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -364,11 +364,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -385,11 +385,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -407,10 +407,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -427,10 +427,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -449,11 +449,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -471,11 +471,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-eth-l2xcbase-pdrchk.robot b/tests/perf/10ge2p1x520-eth-l2xcbase-pdrchk.robot index c534723603..39f70ecd96 100644 --- a/tests/perf/10ge2p1x520-eth-l2xcbase-pdrchk.robot +++ b/tests/perf/10ge2p1x520-eth-l2xcbase-pdrchk.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | ETH | L2XCFWD | BASE | L2XCBASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput L2XC verify test cases* @@ -64,12 +64,12 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot index 023915cb16..3152a38038 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrchk.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 whitelist verify test cases* | ... @@ -64,11 +64,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.1mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -87,11 +87,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -110,10 +110,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -132,11 +132,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 7.2mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -155,11 +155,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -178,10 +178,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -200,11 +200,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -223,11 +223,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -246,10 +246,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot index c1e1a5ad50..46263cdfff 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-copwhtlistbase-ndrpdrdisc.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | COPWHLIST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 whitelist test cases* @@ -73,11 +73,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -101,11 +101,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -130,11 +130,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -158,11 +158,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -187,10 +187,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -214,10 +214,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -242,11 +242,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -270,11 +270,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -299,11 +299,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -327,11 +327,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -356,10 +356,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -383,10 +383,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -411,11 +411,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -439,11 +439,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -468,11 +468,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -496,11 +496,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -525,10 +525,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 @@ -552,10 +552,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 10.10.10.0 | 24 | 1 |Â local | | And Add fib table | ${dut2} | 20.20.20.0 | 24 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip4 | 1 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot index 3bfcf9044f..6feb74285d 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -80,17 +80,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -112,17 +112,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -145,17 +145,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -177,17 +177,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -211,17 +211,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -244,17 +244,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -277,17 +277,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -309,17 +309,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -342,17 +342,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -374,17 +374,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -408,17 +408,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -441,17 +441,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -474,17 +474,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -506,17 +506,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -539,17 +539,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -571,17 +571,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -605,17 +605,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} @@ -638,17 +638,17 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost in 3-node circular topology | | ... | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | ${dut1_vif1_mac} | | ... | ${dut1_vif2_mac} | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd-mac connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | ${dut2_vif1_mac} | | ... | ${dut2_vif2_mac} | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot index cf26caf1d4..fd04f1e509 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} @@ -83,12 +83,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -109,12 +109,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -136,12 +136,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -162,12 +162,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -190,12 +190,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -217,12 +217,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -244,12 +244,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -270,12 +270,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -297,12 +297,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -323,12 +323,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -351,12 +351,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -378,12 +378,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -405,12 +405,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -431,12 +431,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -458,12 +458,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -484,12 +484,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -512,12 +512,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -539,12 +539,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot index b293f4fd04..e816298be5 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrchk.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 whitelist verify test cases* | ... @@ -64,11 +64,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.6mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -95,11 +95,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -126,10 +126,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -156,11 +156,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 6.3mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -187,11 +187,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -218,10 +218,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -248,11 +248,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 9.7mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -279,11 +279,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -310,10 +310,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot index 0721698afb..82eb90094f 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-iacldstbase-ndrpdrdisc.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | IACLDST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 iAcl whitelist test cases* @@ -73,11 +73,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -109,11 +109,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -146,11 +146,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -182,11 +182,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -219,10 +219,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -254,10 +254,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -290,11 +290,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -326,11 +326,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -363,11 +363,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -399,11 +399,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -436,10 +436,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -471,10 +471,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -507,11 +507,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -543,11 +543,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -580,11 +580,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -616,11 +616,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -653,10 +653,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 @@ -688,10 +688,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology | | ${table_idx} | ${skip_n} | ${match_n}= | And Vpp Creates Classify Table L3 | | ... | ${dut1} | ip4 | dst | | And Vpp Configures Classify Session L3 diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot index 86341c3041..788b2b682c 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrchk.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 policer verify test cases* | ... @@ -67,12 +67,12 @@ | | ${rate}= | Set Variable | 3.6mpps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -86,12 +86,12 @@ | | ${rate}= | Set Variable | 812743pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -105,11 +105,11 @@ | | ${rate}= | Set Variable | 138580pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -123,12 +123,12 @@ | | ${rate}= | Set Variable | 6.2mpps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -142,12 +142,12 @@ | | ${rate}= | Set Variable | 812743pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -161,11 +161,11 @@ | | ${rate}= | Set Variable | 138580pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -179,12 +179,12 @@ | | ${rate}= | Set Variable | 10.4mpps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -198,12 +198,12 @@ | | ${rate}= | Set Variable | 812743pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -217,10 +217,10 @@ | | ${rate}= | Set Variable | 138580pps | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot index 2e75e5315d..011cc5d352 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot @@ -22,12 +22,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 policer test cases* @@ -77,12 +77,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -102,12 +102,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -128,12 +128,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -153,12 +153,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -179,11 +179,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -203,11 +203,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -228,12 +228,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -253,12 +253,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -279,12 +279,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -304,12 +304,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -330,11 +330,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -354,11 +354,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -379,12 +379,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -404,12 +404,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -430,12 +430,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -455,12 +455,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -481,11 +481,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -505,11 +505,11 @@ | | ${threshold}= | Set Variable | ${min_rate} | | Set Test Variable | ${cb} | ${framesize} | | Set Test Variable | ${eb} | ${framesize} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding initialized in a 3-node circular topology -| | And IPv4 policer 2r3c-'ca' initialized in a 3-node circular topology +| | When Initialize IPv4 forwarding in 3-node circular topology +| | And Initialize IPv4 policer 2r3c-'ca' in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot index 8f949a39ee..6fff5e4436 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrchk.robot @@ -24,12 +24,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 routing verify test cases* | ... @@ -64,11 +64,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.6mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -80,11 +80,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -96,10 +96,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -111,11 +111,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -127,11 +127,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -143,10 +143,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -158,11 +158,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -174,11 +174,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -190,9 +190,9 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot index 8f2bee9aad..32108cfadf 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-ndrpdrdisc.robot @@ -24,12 +24,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* @@ -73,11 +73,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -94,11 +94,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -116,11 +116,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -137,11 +137,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -159,10 +159,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -179,10 +179,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -200,11 +200,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -221,11 +221,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -243,11 +243,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -264,11 +264,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -286,10 +286,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -306,10 +306,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -327,11 +327,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -348,11 +348,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -370,11 +370,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -391,11 +391,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -413,10 +413,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -433,10 +433,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -455,11 +455,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -477,11 +477,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-pdrchk.robot index e0f202a013..ae724087b9 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-pdrchk.robot @@ -24,11 +24,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | BASE | IP4BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput IPv4 routing verify test cases* @@ -70,12 +70,12 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot index 3f97e074cf..a31537fbd8 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -72,7 +72,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -85,12 +85,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -103,7 +103,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -114,12 +114,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -133,7 +133,7 @@ | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -146,12 +146,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -164,7 +164,7 @@ | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -175,12 +175,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -194,7 +194,7 @@ | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -207,12 +207,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -225,7 +225,7 @@ | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -236,12 +236,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot index aa70f54ed9..3973d82909 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 routing verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.3mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -75,11 +75,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -92,10 +92,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -108,11 +108,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 9.1mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -125,11 +125,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -142,10 +142,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -158,11 +158,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -175,11 +175,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -192,10 +192,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot index e133ad65c6..d2939cdb87 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale200k-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_200K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* @@ -68,11 +68,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -90,11 +90,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -113,11 +113,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -135,11 +135,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -158,10 +158,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -179,10 +179,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -201,11 +201,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -223,11 +223,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -246,11 +246,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -268,11 +268,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -291,10 +291,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -312,10 +312,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -334,11 +334,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -356,11 +356,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -379,11 +379,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -401,11 +401,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -424,10 +424,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -445,10 +445,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot index ac8db11afb..e354ed8b6b 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 routing verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 4.3mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -76,11 +76,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -94,10 +94,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -111,11 +111,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 9.0mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -129,11 +129,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -147,10 +147,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -164,11 +164,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -182,11 +182,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -200,10 +200,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot index 1b68b96b15..71bc7e87eb 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale20k-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_20K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* @@ -68,11 +68,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -90,11 +90,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -113,11 +113,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -135,11 +135,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -158,10 +158,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -179,10 +179,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -201,11 +201,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -223,11 +223,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -246,11 +246,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -268,11 +268,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -291,10 +291,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -312,10 +312,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -334,11 +334,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -356,11 +356,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -379,11 +379,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -401,11 +401,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -424,10 +424,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -445,10 +445,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot index 282f0f17c3..7f158cdf9f 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv4 routing verify test cases* | ... @@ -58,12 +58,12 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.7mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -77,12 +77,12 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -96,11 +96,11 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -114,12 +114,12 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 7.6mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -133,12 +133,12 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -152,11 +152,11 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -170,12 +170,12 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 10.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -189,12 +189,12 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -208,11 +208,11 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} diff --git a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot index c179ee4cba..618c032584 100644 --- a/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4-ip4scale2m-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | SCALE | FIB_2M | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* @@ -68,12 +68,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -91,12 +91,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -115,12 +115,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -138,12 +138,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -162,11 +162,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -184,11 +184,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -207,12 +207,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -230,12 +230,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -254,12 +254,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -277,12 +277,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -301,11 +301,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -323,11 +323,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -346,12 +346,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -369,12 +369,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -393,12 +393,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -416,12 +416,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -440,11 +440,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -462,11 +462,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot index db82ce01ea..540c1c6818 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrchk.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput Lisp tunnel verify test cases* | ... @@ -61,14 +61,14 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 1.9mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -85,14 +85,14 @@ | | [Tags] | 1480B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1480} | | ${rate}= | Set Variable | 740000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -109,13 +109,13 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -132,14 +132,14 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.6mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -156,14 +156,14 @@ | | [Tags] | 1480B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1480} | | ${rate}= | Set Variable | 740000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -180,13 +180,13 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -203,14 +203,14 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.5mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -227,14 +227,14 @@ | | [Tags] | 1480B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1480} | | ${rate}= | Set Variable | 740000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -251,13 +251,13 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot index 59e291f13a..32fa6fbf6f 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC6830: Pkt throughput Lisp test cases* @@ -64,14 +64,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -94,14 +94,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -125,14 +125,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -155,14 +155,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -186,13 +186,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -215,13 +215,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -245,14 +245,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -275,14 +275,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -306,14 +306,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -336,14 +336,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -367,13 +367,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -396,13 +396,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -426,14 +426,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -456,14 +456,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -487,14 +487,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -517,14 +517,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -548,13 +548,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} @@ -577,13 +577,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} diff --git a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot index 3752ed04b2..1971129f85 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip4-ip4base-pdrchk.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP4UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput Lisp tunnel verify test cases* @@ -66,15 +66,15 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_tg_ip4} | ${prefix4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid} diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot index 27c74a165b..a60f7c8fc4 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrchk.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput Lisp tunnel verify test cases* | ... @@ -61,14 +61,14 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 1.53mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -85,14 +85,14 @@ | | [Tags] | 1460B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -109,13 +109,13 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -132,14 +132,14 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.25mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -156,14 +156,14 @@ | | [Tags] | 1460B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -180,13 +180,13 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -203,14 +203,14 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 3.12mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -227,14 +227,14 @@ | | [Tags] | 1460B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -251,13 +251,13 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot index 97d618ce49..973edf8b22 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC6830: Pkt throughput Lisp test cases* @@ -65,14 +65,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -95,14 +95,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -126,14 +126,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -156,14 +156,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -187,13 +187,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -216,13 +216,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -246,14 +246,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -276,14 +276,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -307,14 +307,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -337,14 +337,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -368,13 +368,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -397,13 +397,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -427,14 +427,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -457,14 +457,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -488,14 +488,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -518,14 +518,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -549,13 +549,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} @@ -578,13 +578,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} diff --git a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot index 3fe0f5ec81..2d6a5e3a45 100644 --- a/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4lispip6-ip4base-pdrchk.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | IP4FWD | ENCAP | LISP | IP6UNRLAY | IP4OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput Lisp tunnel verify test cases* @@ -66,15 +66,15 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip4o6} | ${dut1_to_tg_ip4o6} | ${dut2_to_dut1_ip4o6} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | ${dut_prefix4o6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip4o6_eid} | ${dut2_ip4o6_eid} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot index 27739e98a8..590607b429 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -74,7 +74,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -87,12 +87,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -105,7 +105,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -116,12 +116,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -135,7 +135,7 @@ | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -148,12 +148,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -166,7 +166,7 @@ | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -177,12 +177,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -196,7 +196,7 @@ | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -209,12 +209,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -227,7 +227,7 @@ | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -238,12 +238,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot index bd97fd560a..d6adbe0131 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot @@ -20,11 +20,11 @@ | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_10 | ... | SCALE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -75,7 +75,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -88,12 +88,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -106,7 +106,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -117,12 +117,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -136,7 +136,7 @@ | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -149,12 +149,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -167,7 +167,7 @@ | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -178,12 +178,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -197,7 +197,7 @@ | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -210,12 +210,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -228,7 +228,7 @@ | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -239,12 +239,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot index 4e4db964fc..95aad532a2 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot @@ -20,11 +20,11 @@ | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_100 | ... | SCALE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -75,7 +75,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -88,12 +88,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -106,7 +106,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -117,12 +117,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -136,7 +136,7 @@ | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -149,12 +149,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -167,7 +167,7 @@ | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -178,12 +178,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -197,7 +197,7 @@ | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -210,12 +210,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -228,7 +228,7 @@ | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -239,12 +239,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot index 4992d5dd61..aff299f433 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot @@ -20,11 +20,11 @@ | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_1000 | ... | SCALE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -75,7 +75,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -88,12 +88,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -106,7 +106,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -117,12 +117,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -136,7 +136,7 @@ | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -149,12 +149,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -167,7 +167,7 @@ | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -178,12 +178,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -197,7 +197,7 @@ | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -210,12 +210,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -228,7 +228,7 @@ | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -239,12 +239,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot index 427f4e2dd5..1faaaa87a8 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot @@ -20,11 +20,11 @@ | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_2000 | ... | SCALE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -75,7 +75,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -88,12 +88,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -106,7 +106,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -117,12 +117,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot index 6590132e74..a5536ae012 100644 --- a/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot @@ -20,11 +20,11 @@ | ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_4000 | ... | SCALE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | ... | Documentation | *SNAT performance test cases* | ... @@ -75,7 +75,7 @@ | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Run keywords | Performance test teardown | ${min_rate}pps +| | [Teardown] | Run keywords | Tear down performance discovery test | ${min_rate}pps | | ... | ${framesize} | ${traffic_profile} | | ... | AND | Show SNAT verbose | ${dut1} | | ... | AND | Show SNAT verbose | ${dut2} @@ -88,12 +88,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -106,7 +106,7 @@ | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\ | | ... | linerate, step 100kpps. | | ... -| | [Teardown] | Performance test teardown | ${min_rate}pps | ${framesize} +| | [Teardown] | Tear down performance discovery test | ${min_rate}pps | ${framesize} | | ... | ${traffic_profile} | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC | SKIP_PATCH @@ -117,12 +117,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Add SNAT to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When SNAT is initialized in a 3-node circular topology +| | When Initialize SNAT in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot index 07bbfc7bf2..ea26c607db 100644 --- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | ... | NIC_Intel-X520-DA2 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -88,16 +88,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -121,16 +121,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -155,15 +155,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -187,15 +187,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -222,15 +222,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -256,15 +256,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -289,16 +289,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -322,16 +322,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -356,15 +356,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -388,15 +388,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -423,15 +423,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -457,15 +457,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -490,16 +490,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -523,16 +523,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -557,15 +557,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -589,15 +589,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -624,15 +624,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -658,15 +658,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot index 8887b357a4..1f087c390e 100644 --- a/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | L2BDMACLRN | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Packet throughput L2BD with VXLANoIPv4 test cases* @@ -71,11 +71,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -95,11 +95,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -120,10 +120,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -143,10 +143,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -167,10 +167,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -190,10 +190,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -214,11 +214,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -238,11 +238,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -263,10 +263,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -286,10 +286,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -310,10 +310,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -333,10 +333,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -357,11 +357,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -381,11 +381,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -406,10 +406,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -429,10 +429,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -453,10 +453,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -476,10 +476,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot index 2cd2c26023..5399cffdd7 100644 --- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput L2XC with VXLANoIPv4 verify test\ | ... | cases* @@ -59,11 +59,11 @@ | | [Tags] | 64B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 2.4mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -75,10 +75,10 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 787153pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -90,10 +90,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 137816pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -105,11 +105,11 @@ | | [Tags] | 64B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 5.2mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -121,10 +121,10 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 787153pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -136,10 +136,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 137816pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -151,11 +151,11 @@ | | [Tags] | 64B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${64} | | ${rate}= | Set Variable | 8.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -167,10 +167,10 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 787153pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -182,9 +182,9 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 137816pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot index 73696d2a0f..5293077452 100644 --- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2XC with VXLANoIPv4 test cases* @@ -67,11 +67,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -88,11 +88,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -110,10 +110,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -130,10 +130,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -151,10 +151,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,10 +171,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -192,11 +192,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -213,11 +213,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -235,10 +235,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -255,10 +255,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -276,10 +276,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -296,10 +296,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -317,11 +317,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -338,11 +338,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -360,10 +360,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -380,10 +380,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -401,10 +401,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -421,10 +421,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot index 4e16f6b340..e0a612bee7 100644 --- a/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip4vxlan-l2xcbase-pdrchk.robot @@ -17,11 +17,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | L2XCFWD | ENCAP | VXLAN | L2OVRLAY | IP4UNRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput L2XC with VXLANoIPv4 verify test\ @@ -65,12 +65,12 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology +| | And Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot index ee4b9c334f..d734f9da0f 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrchk.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 whitelist verify test cases* | ... @@ -60,11 +60,11 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.1mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -83,11 +83,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -106,10 +106,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -128,11 +128,11 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 5.9mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -151,11 +151,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -174,10 +174,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -196,11 +196,11 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 9.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -219,11 +219,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -242,10 +242,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot index 8d353fd207..e64435ddaa 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-copwhtlistbase-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | COPWHLIST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 whitelist test cases* @@ -69,11 +69,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -97,11 +97,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -126,11 +126,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -154,11 +154,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -183,10 +183,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -210,10 +210,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -238,11 +238,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -266,11 +266,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -295,11 +295,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -323,11 +323,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -352,10 +352,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -379,10 +379,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -407,11 +407,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -435,11 +435,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -464,11 +464,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -492,11 +492,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -521,10 +521,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 @@ -548,10 +548,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize IPv6 forwarding in 3-node circular topology | | And Add fib table | ${dut1} | 2001:1:: | 64 | 1 |Â local | | And Add fib table | ${dut2} | 2001:2:: | 64 | 1 |Â local | | And COP Add whitelist Entry | ${dut1} | ${dut1_if1} | ip6 | 1 diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot index 75a10f6154..dddb42dbfa 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrchk.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 whitelist verify test cases* | ... @@ -59,12 +59,12 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.2mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -77,12 +77,12 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -95,11 +95,11 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -112,12 +112,12 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 5.7mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -130,12 +130,12 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -148,11 +148,11 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -165,12 +165,12 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 9.2mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -183,12 +183,12 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -201,10 +201,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot index 7984867f8f..e3fafe9c76 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-iacldstbase-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | IACLDST | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 iAcl whitelist test cases* @@ -68,12 +68,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -91,12 +91,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -115,12 +115,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -138,12 +138,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -162,11 +162,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -184,11 +184,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -207,12 +207,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -230,12 +230,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -254,12 +254,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -277,12 +277,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -301,11 +301,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -323,11 +323,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -346,12 +346,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -369,12 +369,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -393,12 +393,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -416,12 +416,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -440,11 +440,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -462,11 +462,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology -| | And IPv6 iAcl whitelist initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology +| | And Initialize IPv6 iAcl whitelist in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot index 8cb125f8f5..57b6e948af 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 routing verify test cases* | ... @@ -57,11 +57,11 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.9mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -73,11 +73,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -89,10 +89,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -104,11 +104,11 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 8.1mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -120,11 +120,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -136,10 +136,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -151,11 +151,11 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 9.4mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -167,11 +167,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -183,9 +183,9 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot index cb9de05380..b3392c5d93 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* @@ -65,11 +65,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -86,11 +86,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -108,11 +108,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -129,11 +129,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -151,10 +151,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,10 +171,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -192,11 +192,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -213,11 +213,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -235,11 +235,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -256,11 +256,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -278,10 +278,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -298,10 +298,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -319,11 +319,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -340,11 +340,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -362,11 +362,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -383,11 +383,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -405,10 +405,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -425,10 +425,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6base-pdrchk.robot index 39d738099d..26e41713b1 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6base-pdrchk.robot @@ -17,11 +17,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | BASE | IP6BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput IPv6 routing verify test cases* @@ -63,12 +63,12 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} | | ... | ${perf_pdr_loss_acceptance} | ${perf_pdr_loss_acceptance_type} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot index ea5232ed89..d9249ab857 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_200K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 routing verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 2.3mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -75,11 +75,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -92,10 +92,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -108,11 +108,11 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 5.0mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -125,11 +125,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -142,10 +142,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -158,11 +158,11 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 5.7mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -175,11 +175,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -192,10 +192,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot index 33e42f5e11..7e3cfa1ba0 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale200k-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_200K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* @@ -68,11 +68,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -90,11 +90,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -113,11 +113,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -135,11 +135,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -158,10 +158,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -179,10 +179,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -201,11 +201,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -223,11 +223,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -246,11 +246,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -268,11 +268,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -291,10 +291,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -312,10 +312,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -334,11 +334,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -356,11 +356,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -379,11 +379,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -401,11 +401,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -424,10 +424,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -445,10 +445,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot index 8a59d4bda5..239dc9552d 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_20K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 routing verify test cases* | ... @@ -58,11 +58,11 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 2.9mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -75,11 +75,11 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -92,10 +92,10 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -108,11 +108,11 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 7.0mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -125,11 +125,11 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -142,10 +142,10 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -158,11 +158,11 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 10.0mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -175,11 +175,11 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} @@ -192,10 +192,10 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot index bee41a66f7..481cd7cad8 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale20k-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_20K | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* @@ -68,11 +68,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -90,11 +90,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -113,11 +113,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -135,11 +135,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -158,10 +158,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -179,10 +179,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -201,11 +201,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -223,11 +223,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -246,11 +246,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -268,11 +268,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -291,10 +291,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -312,10 +312,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -334,11 +334,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -356,11 +356,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -379,11 +379,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -401,11 +401,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -424,10 +424,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -445,10 +445,10 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot index 2f30d4202a..21e9015a18 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrchk.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput IPv6 routing verify test cases* | ... @@ -58,12 +58,12 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 1.8mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -77,12 +77,12 @@ | | [Tags] | 1518B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -96,11 +96,11 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -114,12 +114,12 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 4.0mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -133,12 +133,12 @@ | | [Tags] | 1518B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -152,11 +152,11 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -170,12 +170,12 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 6.8mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -189,12 +189,12 @@ | | [Tags] | 1518B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1518} | | ${rate}= | Set Variable | 812743pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} @@ -208,11 +208,11 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 138580pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate} | | ... | ${framesize} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot index 8fe12dc9a3..483fd8aa43 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* @@ -68,12 +68,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -91,12 +91,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -115,12 +115,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -138,12 +138,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -162,11 +162,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -184,11 +184,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -207,12 +207,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -230,12 +230,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -254,12 +254,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -277,12 +277,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -301,11 +301,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -323,11 +323,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -346,12 +346,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -369,12 +369,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -393,12 +393,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -416,12 +416,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -440,11 +440,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -462,11 +462,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Heapsize Config to all DUTs | 3G +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot index e487e6e018..84de700bd5 100644 --- a/tests/perf/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6-ip6scale2m-pdrchk.robot @@ -17,11 +17,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | SCALE | FIB_2M | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput IPv6 routing verify test cases* @@ -64,13 +64,13 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs -| | And Add Heapsize Config to all DUTs | 3G +| | ... | Add no multi seg to all DUTs +| | And Add heapsize config to all DUTs | 3G | | And Apply startup configuration on all VPP DUTs -| | And Scale IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding with scaling in 3-node circular topology | | ... | ${rts_per_flow} | | Then Traffic should pass with partial loss | ${perf_trial_duration} | | ... | ${rate} | ${framesize} | ${traffic_profile} diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot index 68ff8e3743..6151a5572c 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrchk.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput Lisp tunnel verify test cases* | ... @@ -61,14 +61,14 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 1.75mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -85,14 +85,14 @@ | | [Tags] | 1460B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -109,13 +109,13 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -132,14 +132,14 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.42mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -156,14 +156,14 @@ | | [Tags] | 1460B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -180,13 +180,13 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -203,14 +203,14 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.42mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -227,14 +227,14 @@ | | [Tags] | 1460B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 720000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -251,13 +251,13 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot index ad13636d8f..af06074057 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC6830: Pkt throughput Lisp test cases* @@ -65,14 +65,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -95,14 +95,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -126,14 +126,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -156,14 +156,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -187,13 +187,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -216,13 +216,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -246,14 +246,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -276,14 +276,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -307,14 +307,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -337,14 +337,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -368,13 +368,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -397,13 +397,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -427,14 +427,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -457,14 +457,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -488,14 +488,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -518,14 +518,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -549,13 +549,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} @@ -578,13 +578,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} diff --git a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot index 7628b9c8e6..0f0a990d51 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip4-ip6base-pdrchk.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP4UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput Lisp tunnel verify test cases* @@ -66,15 +66,15 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6o4} | ${dut1_to_tg_ip6o4} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | ${dut_prefix6o4} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6o4_eid} | ${dut2_ip6o4_eid} diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6Base-pdrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6Base-pdrchk.robot index 3278c7137d..af8c88f286 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6Base-pdrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6Base-pdrchk.robot @@ -19,11 +19,11 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PDRCHK | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup +| Test Setup | Set up performance test | Test Teardown | Performance pdrchk test teardown | ... | Documentation | *Reference PDR throughput Lisp tunnel verify test cases* @@ -66,15 +66,15 @@ | | Set Test Variable | ${rate} | | ${get_framesize}= | Get Frame Size | ${framesize} | | ... -| | Given Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Run Keyword If | ${get_framesize} < ${1522} -| | ... | Add No Multi Seg to all DUTs +| | ... | Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot index 798edbca44..aa68c99778 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance ndrchk test teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance ndrchk test | ... | Documentation | *Reference NDR throughput Lisp tunnel verify test cases* | ... @@ -61,14 +61,14 @@ | | [Tags] | 78B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 1.56mpps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -85,14 +85,14 @@ | | [Tags] | 1460B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 740000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -109,13 +109,13 @@ | | [Tags] | 9000B | 1T1C | STHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -132,14 +132,14 @@ | | [Tags] | 78B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.2mpps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -156,14 +156,14 @@ | | [Tags] | 1460B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 740000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -180,13 +180,13 @@ | | [Tags] | 9000B | 2T2C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -203,14 +203,14 @@ | | [Tags] | 78B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${78} | | ${rate}= | Set Variable | 3.2mpps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -227,14 +227,14 @@ | | [Tags] | 1460B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${1460} | | ${rate}= | Set Variable | 740000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -251,13 +251,13 @@ | | [Tags] | 9000B | 4T4C | MTHREAD | | ${framesize}= | Set Variable | ${9000} | | ${rate}= | Set Variable | 120000pps -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot index ed6e99a8f9..494630a598 100644 --- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC6830: Pkt throughput Lisp test cases* @@ -65,14 +65,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -95,14 +95,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -126,14 +126,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -156,14 +156,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -187,13 +187,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -216,13 +216,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -246,14 +246,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -276,14 +276,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -307,14 +307,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -337,14 +337,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -368,13 +368,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -397,13 +397,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -427,14 +427,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -457,14 +457,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -488,14 +488,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -518,14 +518,14 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -549,13 +549,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} @@ -578,13 +578,13 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When Lisp IPv6 forwarding initialized in a 3-node circular topology +| | When Initialize LISP IPv6 forwarding in 3-node circular topology | | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_tg_ip6} | ${prefix6} -| | And Set up Lisp topology +| | And Configure LISP topology in 3-node circular topology | | ... | ${dut1} | ${dut1_if2} | ${NONE} | | ... | ${dut2} | ${dut2_if1} | ${NONE} | | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid} diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot index 298c3d40ad..4649404b77 100644 --- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -83,16 +83,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -115,16 +115,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -148,16 +148,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -180,16 +180,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -214,16 +214,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -247,15 +247,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -279,16 +279,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -311,16 +311,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -344,16 +344,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -376,16 +376,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -410,16 +410,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -443,16 +443,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -476,16 +476,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -508,16 +508,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -541,16 +541,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -573,16 +573,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -607,16 +607,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -640,16 +640,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot index a1e4bf4ce6..f793b8cb6b 100644 --- a/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-X710 | ETH | L2BDMACLRN | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2BD test cases* @@ -62,12 +62,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -80,12 +80,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot index 28ffef0b59..67220372fe 100644 --- a/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1vic1385-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Cisco-VIC-1385 | ETH | L2BDMACLRN | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Cisco-VIC-1385 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2BD test cases* @@ -72,11 +72,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -96,11 +96,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -121,11 +121,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -145,11 +145,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -169,11 +169,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -193,11 +193,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance} @@ -218,11 +218,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -242,11 +242,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -266,11 +266,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -291,11 +291,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -316,11 +316,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -341,11 +341,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 bridge domain initialized in a 3-node circular topology +| | And Initialize L2 bridge domain in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot index 9af93d3f93..df0c30febf 100644 --- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhost-1vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -85,16 +85,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -117,16 +117,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -150,16 +150,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -182,16 +182,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -216,16 +216,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -249,15 +249,15 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -281,16 +281,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -313,16 +313,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -346,16 +346,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -378,16 +378,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -412,16 +412,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -445,16 +445,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -478,16 +478,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -510,16 +510,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -543,16 +543,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -575,16 +575,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} @@ -609,16 +609,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} @@ -642,16 +642,16 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${dut1_vm_refs}= | Create Dictionary | | ${dut2_vm_refs}= | Create Dictionary -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User initialized in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User in 3-node circular topology | | ... | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} -| | ${vm1}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm1}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM1 | | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM1 | ${vm1} -| | ${vm2}= | And Guest VM with dpdk-testpmd connected via vhost-user is setup +| | ${vm2}= | And Configure guest VM with dpdk-testpmd connected via vhost-user | | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM1 | | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM1 | ${vm2} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot index d81a40bf07..f0153316c8 100644 --- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-eth-4vhost-2vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -86,12 +86,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -114,12 +114,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -143,12 +143,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,12 +171,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -201,12 +201,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -230,12 +230,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -259,12 +259,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -287,12 +287,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -316,12 +316,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -344,12 +344,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -374,12 +374,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -403,12 +403,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -432,12 +432,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -460,12 +460,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -489,12 +489,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -517,12 +517,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -547,12 +547,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -576,12 +576,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 bridge domains with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 bridge domains with Vhost-User for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot index 6d450b6a8c..06124b7c26 100644 --- a/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2bdbasemaclrn-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | L2BDMACLRN | BASE -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2BD test cases* @@ -64,12 +64,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -82,12 +82,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -100,12 +100,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -119,12 +119,12 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Add '${wt}' worker threads and rxqueues '${rxq}' in 3-node single-link topo -| | Add PCI devices to DUTs from 3-node single link topology +| | Add '${wt}' worker threads and '${rxq}' rxqueues in 3-node single-link circular topology +| | Add PCI devices to DUTs in 3-node single link topology | | ${get_framesize}= | Get Frame Size | ${framesize} -| | Run Keyword If | ${get_framesize} < ${1522} | Add No Multi Seg to all DUTs +| | Run Keyword If | ${get_framesize} < ${1522} | Add no multi seg to all DUTs | | Apply startup configuration on all VPP DUTs -| | L2 bridge domain initialized in a 3-node circular topology +| | Initialize L2 bridge domain in 3-node circular topology | | Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot index b0bd555036..60bb066b68 100644 --- a/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-eth-4vhost-2vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | L2XCFWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -86,12 +86,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -114,12 +114,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -143,12 +143,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,12 +171,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -201,12 +201,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -230,12 +230,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -259,12 +259,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -287,12 +287,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -316,12 +316,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -344,12 +344,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -374,12 +374,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -403,12 +403,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -432,12 +432,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -460,12 +460,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -489,12 +489,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -517,12 +517,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -547,12 +547,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -576,12 +576,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When L2 xconnect with Vhost-User for '2' initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology +| | When Initialize L2 xconnect with Vhost-User for '2' in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot index 856cddfa55..05cf9597ae 100644 --- a/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-eth-l2xcbase-ndrpdrdisc.robot @@ -19,12 +19,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | L2XCFWD | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput L2XC test cases* @@ -69,11 +69,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -90,11 +90,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -111,11 +111,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -132,11 +132,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -153,11 +153,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -174,11 +174,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -196,11 +196,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -218,11 +218,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -240,11 +240,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And L2 xconnect initialized in a 3-node circular topology +| | And Initialize L2 xconnect in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot index 4c15189059..6d2cc08ef8 100644 --- a/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-eth-4vhost-2vm-ndrpdrdisc.robot @@ -18,12 +18,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | IP4FWD | BASE | VHOST | VM | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test with vhost and VM with dpdk-testpmd teardown +| Test Setup | Set up performance test +| Test Teardown | Tear down performance test with vhost and VM with dpdk-testpmd | ... | ${min_rate}pps | ${framesize} | ${traffic_profile} | ... | dut1_node=${dut1} | dut1_vm_refs=${dut1_vm_refs} | ... | dut2_node=${dut2} | dut2_vm_refs=${dut2_vm_refs} @@ -86,12 +86,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -114,12 +114,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -143,12 +143,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -171,12 +171,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -201,12 +201,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -230,12 +230,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -259,12 +259,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -287,12 +287,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -316,12 +316,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -344,12 +344,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -374,12 +374,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -403,12 +403,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -432,12 +432,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -460,12 +460,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -489,12 +489,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -517,12 +517,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -547,12 +547,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find NDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -576,12 +576,12 @@ | | ${dut2_vm_refs}= | Create Dictionary | | Set Test Variable | ${dut1_vm_refs} | | Set Test Variable | ${dut2_vm_refs} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | When IPv4 forwarding with Vhost-User for '2' VMs initialized in a 3-node circular topology -| | And '2' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology +| | When Initialize IPv4 forwarding with vhost for '2' VMs in 3-node circular topology +| | And Configure '2' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology | | Then Find PDR using binary search and pps | | ... | ${framesize} | ${binary_min} | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot index 276b260c2d..b73c7e9eb8 100644 --- a/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4-ip4base-ndrpdrdisc.robot @@ -24,12 +24,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | IP4FWD | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv4 routing test cases* @@ -75,11 +75,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -96,11 +96,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -117,11 +117,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -138,11 +138,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -159,11 +159,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -180,11 +180,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -202,11 +202,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -224,11 +224,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -246,11 +246,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology | | And Add all PCI devices to all DUTs -| | And Add No Multi Seg to all DUTs +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv4 forwarding initialized in a 3-node circular topology +| | And Initialize IPv4 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot index 253809da2c..1272e8edd2 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-aes-gcm-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | BASE | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -122,13 +122,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -156,12 +156,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -188,12 +188,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -223,12 +223,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -257,12 +257,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -289,13 +289,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -321,13 +321,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 5014f78ddb..6fa3229ff8 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | BASE | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -122,13 +122,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -155,12 +155,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -186,12 +186,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -220,12 +220,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -253,12 +253,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -285,13 +285,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -317,13 +317,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot index a6f0985ffd..29432d53a8 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | BASE | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -125,13 +125,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -162,12 +162,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -197,12 +197,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -235,12 +235,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -272,12 +272,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -307,13 +307,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -342,13 +342,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot index b77d42f1f6..cb97d4404f 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecbasetnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | BASE | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -125,13 +125,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -161,12 +161,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -195,12 +195,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -232,12 +232,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -268,12 +268,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -303,13 +303,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -338,13 +338,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot index 333ce19998..db1a4eb8b5 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-aes-gcm-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | TNL_1000 | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -122,13 +122,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -156,12 +156,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -188,12 +188,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -223,12 +223,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -257,12 +257,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -289,13 +289,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -321,13 +321,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot index 05448fbd8e..ce90433770 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-int-cbc-sha1-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | TNL_1000 | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -122,13 +122,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -155,12 +155,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -186,12 +186,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -220,12 +220,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -253,12 +253,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -285,13 +285,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} @@ -317,13 +317,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | And VPP IPsec Create Tunnel Interfaces | | ... | ${dut1} | ${dut2} | ${dut1_if2_ip4} | ${dut2_if1_ip4} | ${n_tunnels} | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${laddr_ip4} diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot index ccea631519..5bd3cba03e 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-aes-gcm-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | TNL_1000 | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -125,13 +125,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -162,12 +162,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -197,12 +197,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -235,12 +235,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -272,12 +272,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -307,13 +307,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -342,13 +342,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES GCM 128 | | ${auth_alg}= | Integ Alg AES GCM 128 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels diff --git a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot index d1468d60d3..5c17f22758 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsecscale1000tnl-ip4base-tnl-cbc-sha1-ndrpdrdisc.robot @@ -19,13 +19,13 @@ | ... | IP4FWD | IPSEC | IPSECHW | IPSECTUN | NIC_Intel-XL710 | TNL_1000 | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec tunnel mode performance test suite.* @@ -90,13 +90,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -125,13 +125,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -161,12 +161,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -195,12 +195,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -232,12 +232,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -268,12 +268,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -303,13 +303,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels @@ -338,13 +338,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | And IPsec initialized in a 3-node circular topology +| | And Initialize IPSec in 3-node circular topology | | Vpp Route Add | ${dut1} | ${raddr_ip4} | 8 | ${dut2_if1_ip4} | ${dut1_if2} | | Vpp Route Add | ${dut2} | ${laddr_ip4} | 8 | ${dut1_if2_ip4} | ${dut2_if1} | | And VPP IPsec Add Multiple Tunnels diff --git a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot index 35b38258cb..e047a6e8af 100644 --- a/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip4ipsectptlispgpe-ip4base-cbc-sha1-ndrpdrdisc.robot @@ -22,13 +22,13 @@ | ... | NIC_Intel-XL710 | ... | Suite Setup | Run Keywords -| ... | 3-node Performance Suite Setup with DUT's NIC model | L3 | Intel-XL710 -| ... | AND | Verify Crypto Device On All DUTs | force_init=${True} -| ... | AND | Verify Kernel Module On All DUTs | igb_uio | force_load=${True} -| Suite Teardown | 3-node Performance Suite Teardown +| ... | Set up 3-node performance topology with DUT's NIC model | L3 | Intel-XL710 +| ... | AND | Configure crypto device on all DUTs | force_init=${True} +| ... | AND | Configure kernel module on all DUTs | igb_uio | force_load=${True} +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *IPv4 IPsec transport mode performance test suite.* @@ -89,13 +89,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -119,13 +119,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -150,12 +150,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -179,12 +179,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -210,12 +210,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -240,12 +240,12 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add Cryptodev to all DUTs | ${1} +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add cryptodev to all DUTs | ${1} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -270,13 +270,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -300,13 +300,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${2} +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${2} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -331,13 +331,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${4} +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${4} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} @@ -361,13 +361,13 @@ | | ${threshold}= | Set Variable | ${min_rate} | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And IPsec Generate Keys | ${encr_alg} | ${auth_alg} -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs -| | And Add Cryptodev to all DUTs | ${4} +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Generate keys for IPSec | ${encr_alg} | ${auth_alg} +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs +| | And Add cryptodev to all DUTs | ${4} | | And Apply startup configuration on all VPP DUTs -| | When Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology +| | When Initialize LISP GPE IPv4 over IPsec in 3-node circular topology | | ... | ${encr_alg} | ${auth_alg} | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} diff --git a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot index 0b84e01e21..49862e33fa 100644 --- a/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot +++ b/tests/perf/40ge2p1xl710-ethip6-ip6base-ndrpdrdisc.robot @@ -17,12 +17,12 @@ | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC | ... | NIC_Intel-XL710 | ETH | IP6FWD | BASE | ... -| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model +| Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-XL710 -| Suite Teardown | 3-node Performance Suite Teardown +| Suite Teardown | Tear down 3-node performance topology | ... -| Test Setup | Performance test setup -| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize} +| Test Setup | Set up performance test +| Test Teardown | Tear down performance discovery test | ${min_rate}pps | ${framesize} | ... | ${traffic_profile} | ... | Documentation | *RFC2544: Pkt throughput IPv6 routing test cases* @@ -67,11 +67,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -88,11 +88,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -109,11 +109,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -130,11 +130,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '2' worker threads and '1' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -151,11 +151,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} @@ -172,11 +172,11 @@ | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} -| | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo -| | And Add PCI devices to DUTs from 3-node single link topology -| | And Add No Multi Seg to all DUTs +| | Given Add '4' worker threads and '2' rxqueues in 3-node single-link circular topology +| | And Add PCI devices to DUTs in 3-node single link topology +| | And Add no multi seg to all DUTs | | And Apply startup configuration on all VPP DUTs -| | And IPv6 forwarding initialized in a 3-node circular topology +| | And Initialize IPv6 forwarding in 3-node circular topology | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min} | | ... | ${binary_max} | ${traffic_profile} | | ... | ${min_rate} | ${max_rate} | ${threshold} |