X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2Fl2%2F10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot;h=641f4b862f7e299d88e8647cb01e1362d79944f0;hp=f9cbeb4ca90a6bb9ec738aa4223fc0ad499d1d38;hb=df5ed0d9317e2a1d4a7248459cc6aec39f80a052;hpb=b1a3ce7a60ab930f4ee26a341ff4986ed5b28346;ds=sidebyside diff --git a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot index f9cbeb4ca9..641f4b862f 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdrdisc.robot @@ -19,11 +19,9 @@ | ... | Suite Setup | Run Keywords | Set up 3-node performance topology with DUT's NIC model | ... | L2 | Intel-X520-DA2 -| ... | AND | Create '${lxc_count}' LXC containers on all DUT nodes with '${lxc_cpu}' cpus -| ... | AND | Install VPP on '${lxc_count}' LXC containers on all DUT nodes -| ... | AND | Create memif VPP configuration on '${lxc_count}' LXC containers on all DUT nodes -| ... | AND | Create startup configuration of VPP on '${lxc_count}' LXC containers on all DUT nodes -| Suite Teardown | Tear down 3-node performance topology with LXC +| ... | AND | Set up performance topology with containers +| ... +| Suite Teardown | Tear down 3-node performance topology with container | ... | Test Setup | Set up performance test | ... @@ -61,27 +59,27 @@ # Traffic profile: | ${traffic_profile} | trex-sl-3n-ethip4-ip4src254 # LXC container -| ${lxc_base_name} | slave -| ${lxc_count} | ${1} -| ${lxc_cpu} | ${4} +| ${container_count}= | ${1} +| ${container_engine}= | LXC +| ${container_image}= | ${EMPTY} # CPU settings | ${system_cpus}= | ${1} | ${vpp_cpus}= | ${5} +| ${container_cpus}= | ${3} *** Keywords *** -| L2 Cross Connect with Memif Binary Search +| L2 Cross Connect over Memif Binary Search | | [Arguments] | ${framesize} | ${min_rate} | ${wt} | ${rxq} | ${search_type} | | Set Test Variable | ${framesize} | | Set Test Variable | ${min_rate} -| | ${frame_size}= | Set Variable If +| | ${get_framesize}= | Set Variable If | | ... | "${framesize}" == "IMIX_v4_1" | ${avg_imix_framesize} | ${framesize} -| | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize} +| | ${max_rate}= | Calculate pps | ${s_limit} | ${get_framesize} | | ${binary_min}= | Set Variable | ${min_rate} | | ${binary_max}= | Set Variable | ${max_rate} | | ${threshold}= | Set Variable | ${min_rate} | | 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 | | Apply startup configuration on all VPP DUTs | | Initialize L2 xconnect for '1' memif pairs in 3-node circular topology @@ -104,7 +102,7 @@ | | ... | linerate, step 100kpps. | | ... | | [Tags] | 64B | 1T1C | STHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=NDR | tc02-64B-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -115,7 +113,7 @@ | | ... | linerate, step 100kpps, LT=0.5%. | | ... | | [Tags] | 64B | 1T1C | STHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=1 | rxq=1 | search_type=PDR | tc03-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc @@ -127,7 +125,7 @@ | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B) | | ... | | [Tags] | IMIX | 1T1C | STHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR | tc04-IMIX-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -139,7 +137,7 @@ | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B) | | ... | | [Tags] | IMIX | 1T1C | STHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR | tc05-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc @@ -150,7 +148,7 @@ | | ... | linerate, step 10kpps. | | ... | | [Tags] | 1518B | 1T1C | STHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=NDR | tc06-1518B-1t1c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -161,7 +159,7 @@ | | ... | linerate, step 10kpps, LT=0.5%. | | ... | | [Tags] | 1518B | 1T1C | STHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=1 | rxq=1 | search_type=PDR | tc07-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc @@ -172,7 +170,7 @@ | | ... | linerate, step 100kpps. | | ... | | [Tags] | 64B | 2T2C | MTHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=NDR | tc08-64B-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -183,7 +181,7 @@ | | ... | linerate, step 100kpps, LT=0.5%. | | ... | | [Tags] | 64B | 2T2C | MTHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${64} | min_rate=${100000} | wt=2 | rxq=1 | search_type=PDR | tc09-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc @@ -195,7 +193,7 @@ | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B) | | ... | | [Tags] | IMIX | 2T2C | MTHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR | tc10-IMIX-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -207,7 +205,7 @@ | | ... | IMIX_v4_1 = (28x64B;16x570B;4x1518B) | | ... | | [Tags] | IMIX | 2T2C | MTHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=IMIX_v4_1 | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR | tc11-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-ndrdisc @@ -218,7 +216,7 @@ | | ... | linerate, step 10kpps. | | ... | | [Tags] | 1518B | 2T2C | MTHREAD | NDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search +| | [Template] | L2 Cross Connect over Memif Binary Search | | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=NDR | tc12-1518B-2t2c-eth-l2xcbase-eth-2memif-1lxc-pdrdisc @@ -229,5 +227,5 @@ | | ... | linerate, step 10kpps, LT=0.5%. | | ... | | [Tags] | 1518B | 2T2C | MTHREAD | PDRDISC -| | [Template] | L2 Cross Connect with Memif Binary Search -| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR \ No newline at end of file +| | [Template] | L2 Cross Connect over Memif Binary Search +| | framesize=${1518} | min_rate=${10000} | wt=2 | rxq=1 | search_type=PDR