From 1577123a3c27541181097cb4186aa8855f20b1cc Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 21 Jun 2019 12:15:56 +0000 Subject: Align suite/test teardown/setup + Phase II - aligning FUNC/PERF setup. + 2n/3n compatibility of suite setup. + Same structure of testcase for DEV/PERF. + DEVICE tests are now running VPP startup config in same way as PERF. + DEVICE is using COREKEEPER! - DEVICE tests are running topology compute twice for backward compatibility. TODO to remove. - Still phase III needed to align TAGS, LIBRARIES and remove OLD setup phase. Change-Id: Ib6e1b0ebf4abebf3cbe73b4fda5cac953c2a7270 Signed-off-by: Peter Mikus --- .../vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot | 28 ++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot') diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot index 34429c61ff..dad29ff647 100644 --- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot +++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-dev.robot @@ -12,16 +12,16 @@ # limitations under the License. *** Settings *** -| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/default.robot +| Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/traffic.robot | ... | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | ... | Documentation | *IPv4 routing test cases* @@ -38,6 +38,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${tg_to_dut_if1_ip4}= | 10.10.10.2 | ${tg_to_dut_if2_ip4}= | 20.20.20.2 | ${dut_to_tg_if1_ip4}= | 10.10.10.1 @@ -54,7 +56,10 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -72,7 +77,10 @@ | | ... | | ${hops}= | Set Variable | ${0} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -90,7 +98,10 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} @@ -108,7 +119,10 @@ | | ... | | ${hops}= | Set Variable | ${1} | | ... -| | Given Configure path in 2-node circular topology +| | Given Add PCI devices to all DUTs +| | And Apply startup configuration on all VPP DUTs +| | And VPP Enable Traces On All Duts | ${nodes} +| | When Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Configure IPv4 forwarding in circular topology | ${tg_to_dut_if1_ip4} | | ... | ${tg_to_dut_if2_ip4} | ${dut_to_tg_if1_ip4} | ${dut_to_tg_if2_ip4} -- cgit 1.2.3-korg