From d68951ac245150eeefa6e0f4156e4c1b5c9e9325 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Tue, 12 Nov 2019 05:27:43 +0100 Subject: Python3: resources and libraries Change-Id: I1392c06b1d64f62b141d24c0d42a8e36913b15e2 Signed-off-by: Jan Gelety --- .../perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot | 14 +++++++------- .../perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot | 14 +++++++------- .../2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot | 14 +++++++------- .../2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot | 14 +++++++------- tests/dpdk/perf/__init__.robot | 8 ++++++-- tests/dpdk/perf/regenerate_testcases.py | 2 +- 6 files changed, 35 insertions(+), 31 deletions(-) (limited to 'tests/dpdk/perf') diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot index 99f83482d6..2682873555 100644 --- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot +++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot @@ -15,15 +15,15 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/dpdk/default.robot | Library | resources.libraries.python.DPDK.DPDKTools -| ... +| | Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA | ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE -| ... +| | Suite Setup | Setup suite single link | performance | dpdk | Suite Teardown | Tear down suite | performance | dpdk -| ... +| | Test Template | Local Template -| ... +| | Documentation | *Raw results L2 routing test cases* | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. @@ -55,11 +55,11 @@ | | ... | [Cfg] DUT runs L2 frame forwarding config.\ | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ -| | ... +| | | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} -| | ... +| | | | Set Test Variable | \${frame_size} -| | ... +| | | | Set Max Rate And Jumbo | | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot index 856db6f559..236f2407e6 100644 --- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot +++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot @@ -15,15 +15,15 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/dpdk/default.robot | Library | resources.libraries.python.DPDK.DPDKTools -| ... +| | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA | ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH -| ... +| | Suite Setup | Setup suite single link | performance | dpdk | Suite Teardown | Tear down suite | performance | dpdk -| ... +| | Test Template | Local Template -| ... +| | Documentation | *Raw results IPv4 routing test cases* | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. @@ -55,11 +55,11 @@ | | ... | [Cfg] DUT runs L3 IPv4 routing config.\ | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ -| | ... +| | | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} -| | ... +| | | | Set Test Variable | \${frame_size} -| | ... +| | | | Set Max Rate And Jumbo | | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot index f0f537d32f..5e501ffc09 100644 --- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot +++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot @@ -15,15 +15,15 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/dpdk/default.robot | Library | resources.libraries.python.DPDK.DPDKTools -| ... +| | Force Tags | 2_NODE_SINGLE_LINK_TOPO | HW_ENV | PERFTEST | NDRPDR | 1NUMA | ... | NIC_Intel-X710 | DPDK | ETH | L2XCFWD | BASE -| ... +| | Suite Setup | Setup suite single link | performance | dpdk | Suite Teardown | Tear down suite | performance | dpdk -| ... +| | Test Template | Local Template -| ... +| | Documentation | *Raw results L2 routing test cases* | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology\ | ... | with single links between nodes. @@ -55,11 +55,11 @@ | | ... | [Cfg] DUT runs L2 frame forwarding config.\ | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ -| | ... +| | | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} -| | ... +| | | | Set Test Variable | \${frame_size} -| | ... +| | | | Set Max Rate And Jumbo | | Given Start L2FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot index 5aaf756974..3b1afdd434 100644 --- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot +++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot @@ -15,15 +15,15 @@ | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/dpdk/default.robot | Library | resources.libraries.python.DPDK.DPDKTools -| ... +| | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR | 1NUMA | ... | NIC_Intel-X710 | DPDK | IP4FWD | BASE | ETH -| ... +| | Suite Setup | Setup suite single link | performance | dpdk | Suite Teardown | Tear down suite | performance | dpdk -| ... +| | Test Template | Local Template -| ... +| | Documentation | *Raw results IPv4 routing test cases* | ... | *[Top] Network Topologies:* TG-DUT1-TG 3-node circular topology\ | ... | with single links between nodes. @@ -55,11 +55,11 @@ | | ... | [Cfg] DUT runs L3 IPv4 routing config.\ | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ -| | ... +| | | | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None} -| | ... +| | | | Set Test Variable | \${frame_size} -| | ... +| | | | Set Max Rate And Jumbo | | Given Start L3FWD on all DUTs | ${phy_cores} | ${rxq} | ${jumbo} | | Then Find NDR and PDR intervals using optimized search diff --git a/tests/dpdk/perf/__init__.robot b/tests/dpdk/perf/__init__.robot index 8010a74503..10878c2d19 100644 --- a/tests/dpdk/perf/__init__.robot +++ b/tests/dpdk/perf/__init__.robot @@ -14,25 +14,29 @@ *** Settings *** | Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot +| | Library | resources.libraries.python.SetupFramework | Library | resources.libraries.python.SetupFramework.CleanupFramework | Library | resources.libraries.python.DPDK.DPDKTools +| | Suite Setup | Run Keywords | Setup performance global Variables | ... | AND | Setup Framework | ${nodes} | ... | AND | Install DPDK test on all DUTs | ${nodes} | ... | AND | Get CPU Info from All Nodes | ${nodes} | ... | AND | Update All Numa Nodes | ... | ${nodes} | skip_tg=${True} +| | Suite Teardown | Cleanup Framework | ${nodes} *** Keywords *** | Setup performance global Variables | | [Documentation] | | ... | Setup suite Variables. Variables are used across performance testing. -| | ... +| | | | ... | _NOTE:_ This KW sets following suite variables: | | ... | - pkt_trace - Switch to enable packet trace for test | | ... | - dut_stats - Switch to enable DUT statistics -| | ... +| | | | Set Global Variable | ${pkt_trace} | ${False} | | Set Global Variable | ${dut_stats} | ${False} +| | Set Global Variable | ${nodes} diff --git a/tests/dpdk/perf/regenerate_testcases.py b/tests/dpdk/perf/regenerate_testcases.py index 9a4429fbd5..5274610ddc 100755 --- a/tests/dpdk/perf/regenerate_testcases.py +++ b/tests/dpdk/perf/regenerate_testcases.py @@ -17,4 +17,4 @@ from resources.libraries.python.autogen.Regenerator import Regenerator # Do not match __init__.robot # Match -ndrpdr or future types. -Regenerator().regenerate_glob("*r.robot") +Regenerator().regenerate_glob(u"*r.robot") -- cgit 1.2.3-korg