From 852b10b6724f0ae221e45f1ccb3f8020077b1f33 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 9 Jan 2019 13:15:09 +0000 Subject: CSIT-1389 Refactor current keywords for multichaining - CNF (II) Change-Id: Ic6af8ebf59589bea66322fc87a33218c7dc0c132 Signed-off-by: Peter Mikus --- ...2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot') diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot index b1d789fdb8..2a907982b7 100644 --- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot +++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot @@ -21,17 +21,15 @@ | ... | Set up 3-node performance topology with DUT's NIC model | L2 | ... | Intel-X710 | ... | AND | Set up performance test suite with MEMIF -| ... | AND | Set up performance topology with containers | chains=${1} -| ... | nodeness=${1} | ... -| 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 'CNF' 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 | ... @@ -63,7 +61,6 @@ # Traffic profile: | ${traffic_profile}= | trex-sl-3n-ethip4-ip4src254 # Container -| ${cpu_count_int}= | ${4} | ${container_engine}= | LXC | ${container_chain_topology}= | chain @@ -90,6 +87,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | | And Apply startup configuration on all VPP DUTs +| | And Set up performance test with containers | chains=${1} | nodeness=${1} | | And Initialize L2 Bridge Domain with memif pairs | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} -- cgit 1.2.3-korg