| ... | Set up 3-node performance topology with DUT's NIC model | L2
| ... | Intel-XL710
| ... | AND | Set up performance test suite with MEMIF
-| ... | AND | Set up performance topology with containers
| ...
-| Suite Teardown | Tear down 3-node performance topology with container
+| Suite Teardown | Tear down 3-node performance topology
| ...
-| Test Setup | Run Keywords
-| ... | Set up performance test
-| ... | AND | Restart VPP in all 'VNF' containers
+| Test Setup | Set up performance test
| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
+| Test Teardown | Run Keywords
+| ... | Tear down performance discovery test | ${min_rate}pps
| ... | ${framesize} | ${traffic_profile}
+| ... | AND | Tear down performance test with container
| ...
| Test Template | Local Template
| ...
| ... | version as running on DUT. LXC is limited via cgroup to use 3 cores
| ... | allocated from pool of isolated CPUs. There are no memory contraints.
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop
-| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop
+| ... | Rate) with zero packet loss tolerance and throughput PDR (Partial Drop
| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage
| ... | of packets transmitted. NDR and PDR are discovered for different
| ... | Ethernet L2 frame sizes using MLRsearch library.
*** Variables ***
# XL710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps
-| ${s_24.5G} | ${24500000000}
+| ${s_24.5G}= | ${24500000000}
# XL710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps
-| ${s_18.75Mpps} | ${18750000}
+| ${s_18.75Mpps}= | ${18750000}
# Traffic profile:
-| ${traffic_profile} | trex-sl-3n-ethip4-ip4src254
-# LXC container
-| ${container_count}= | ${1}
+| ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254
+# Container
| ${container_engine}= | LXC
-| ${container_image}= | ${EMPTY}
-| ${container_install_dkms}= | ${FALSE}
| ${container_chain_topology}= | chain
-# CPU settings
-| ${system_cpus}= | ${1}
-| ${vpp_cpus}= | ${5}
-| ${container_cpus}= | ${5}
*** Keywords ***
| Local Template
| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg
| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps}
| | And Apply startup configuration on all VPP DUTs
-| | And Initialize L2 xconnect for '1' memif pairs in 3-node circular topology
+| | And Set up performance test with containers
+| | And Initialize L2 xconnect with memif pairs
| | Then Find NDR and PDR intervals using optimized search
| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}