diff options
author | Peter Mikus <pmikus@cisco.com> | 2019-06-21 12:15:56 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2019-06-25 06:02:52 +0000 |
commit | 1577123a3c27541181097cb4186aa8855f20b1cc (patch) | |
tree | 8db2e4a954e97f7734988fd3d10b69504f370998 /tests/vpp/device/vm_vhost/ip4 | |
parent | cac8f76ce1f9085e9eede19b250f4a4cb9b199e0 (diff) |
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 <pmikus@cisco.com>
Diffstat (limited to 'tests/vpp/device/vm_vhost/ip4')
-rw-r--r-- | tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot index 9c9bd39de5..a1a19473b4 100644 --- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot @@ -20,9 +20,9 @@ | Library | resources.libraries.python.VhostUser | Library | resources.libraries.python.VPPUtil | ... +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/l2/l2_bridge_domain.robot -| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/shared/interfaces.robot | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/shared/traffic.robot @@ -30,8 +30,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | IP4FWD | BASE | ETH | VHOST | 1VM | ... -| Test Setup | Set up VPP device test -| ... +| Suite Setup | Setup suite single link +| Test Setup | Setup test | Test Teardown | Tear down test | packet_trace | vhost | ... | Documentation | *IPv4 routing test cases with vhost user interface* @@ -50,6 +50,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${net1}= | 10.0.1.0 | ${net3}= | 10.0.3.0 | ${net1_ip1}= | 10.0.1.1 @@ -71,7 +73,10 @@ | | ... | the same network. There is created linux bridge on VM to pass packet \ | | ... | from one vhost-user interface to another one. | | ... -| | 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 interfaces in path up | | ${vhost1}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock1} @@ -98,7 +103,7 @@ | | VPP Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | VPP Add IP Neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} | ${tg_to_dut_if2_mac} -| | When Configure VM for vhost L2BD forwarding +| | And Configure VM for vhost L2BD forwarding | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send packet and verify headers | | ... | ${tg_node} | ${net1_ip2} | ${net3_ip2} |