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 --- .../eth2p-ethip4-ip4base-eth-2vhost-1vm-dev.robot | 15 ++++++++++----- .../eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot | 15 ++++++++++----- ...th2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot | 21 ++++++++++++++------- .../eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot | 20 ++++++++++++++------ 4 files changed, 48 insertions(+), 23 deletions(-) (limited to 'tests/vpp/device/vm_vhost') 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} diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot index 3f71f831c4..f125bba035 100644 --- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethip6-ip6base-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/ip6.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 | IP6FWD | 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:* RFC2460, RFC4443, RFC4861 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${net1}= | 2001:1::0 | ${net3}= | 2001:3::0 | ${net1_ip1}= | 2001: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} @@ -104,7 +109,7 @@ | | ... | ${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} diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot index 30ad621eba..2a821a72c7 100644 --- a/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-eth-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot @@ -20,8 +20,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2BDMACLRN | 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 | *L2 bridge-domain test cases with vhost user interface* @@ -41,9 +41,10 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${bd_id1}= | 1 | ${bd_id2}= | 2 - | ${sock1}= | /tmp/sock1 | ${sock2}= | /tmp/sock2 @@ -57,10 +58,13 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on \ | | ... | receive. [Ref] | | ... -| | 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 -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} | | And Create bridge domain | ${dut_node} | ${bd_id1} @@ -87,10 +91,13 @@ | | ... | switched thru DUT1 and VM in both directions and are correct on \ | | ... | receive. [Ref] | | ... -| | 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 -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | | ... | ${sock2} | | And Create bridge domain | ${dut_node} | ${bd_id1} diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot index b610a6cb29..a820bd2cbb 100644 --- a/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot +++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-eth-l2xcbase-eth-2vhost-1vm-dev.robot @@ -24,8 +24,8 @@ | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | ... | FUNCTEST | L2XCFWD | 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 | *L2 cross-connect test cases with vhost user interface* @@ -45,6 +45,8 @@ | ... | *[Ref] Applicable standard specifications:* RFC792 *** Variables *** +| @{plugins_to_enable}= | dpdk_plugin.so +| ${nic_name}= | virtual | ${sock1}= | /tmp/sock1 | ${sock2}= | /tmp/sock2 @@ -58,10 +60,13 @@ | | ... | i/fs to be switched by DUT to and from VM; verify all packets \ | | ... | are received. [Ref] | | ... -| | 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 -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | ${sock2} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} @@ -80,10 +85,13 @@ | | ... | be switched by DUT to and from VM; verify all packets are \ | | ... | received. [Ref] | | ... -| | 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 -| | When Configure vhost interfaces for L2BD forwarding | ${dut_node} +| | And Configure vhost interfaces for L2BD forwarding | ${dut_node} | | ... | ${sock1} | ${sock2} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if1} | ${vhost_if1} | | And Configure L2XC | ${dut_node} | ${dut_to_tg_if2} | ${vhost_if2} -- cgit 1.2.3-korg