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>

2 files changed, 21 insertions, 13 deletions

diff --git a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
index 0cd3dc82ec..6cf2b324d4 100644
--- a/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-eth-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -27,9 +27,8 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | L2BD | BASE | ETH | TAP
 | ...
-| Test Setup | Run Keywords | Set up VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
-| ...
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test | namespace
 | Test Teardown | Tear down test | packet_trace | namespace | linux_bridge
 | ...
 | Documentation | *Tap Interface Traffic Tests*
@@ -47,10 +46,11 @@
 | ... | *[Ref] Applicable standard specifications:*
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
 | ${bid_from_TG}= | 19
 | ${bid_to_TG}= | 20
 | ${bid_TAP}= | tapBr
-
 | ${tap_int1}= | tap0
 | ${tap_int2}= | tap1
 
@@ -63,7 +63,10 @@
 | | ... | [Ver] Packet sent from TG is passed through all L2BD and received\
 | | ... | back on TG. Then src_ip, dst_ip and MAC are checked.
 | | ...
-| | Given Configure path in 2-node circular topology | ${nodes['TG']}
+| | 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 Set interfaces in 2-node circular topology up
 | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1}
diff --git a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
index 24d0cdd44a..7568f03765 100644
--- a/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethip4-ip4base-eth-1tap-dev.robot
@@ -17,10 +17,10 @@
 | Library  | resources.libraries.python.Tap
 | Library  | resources.libraries.python.Trace
 | ...
+| Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/ip/ip4.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
@@ -28,9 +28,8 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV
 | ... | FUNCTEST | IP4FWD | BASE | ETH | IP4BASE | TAP
 | ...
-| Test Setup | Run Keywords | Set up VPP device test
-| ... | AND | Clean Up Namespaces | ${nodes['DUT1']}
-| ...
+| Suite Setup | Setup suite single link
+| Test Setup | Setup test | namespace
 | Test Teardown | Tear down test | packet_trace | namespace
 | ...
 | Documentation | *Tap Interface Traffic Tests*
@@ -48,13 +47,13 @@
 | ... | *[Ref] Applicable standard specifications:*
 
 *** Variables ***
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${nic_name}= | virtual
 | ${tap1_VPP_ip}= | 16.0.10.1
 | ${tap1_NM_ip}= | 16.0.10.2
 | ${tap1_NM_mac}= | 02:00:00:00:00:02
 | ${tap_int1}= | tap0
-
 | ${namespace1}= | nmspace1
-
 | ${dut_ip_address}= | 192.168.0.1
 | ${tg_ip_address}= | 192.168.0.2
 | ${tg_ip_address_GW}= | 192.168.0.0
@@ -68,7 +67,10 @@
 | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\
 | | ... | received on TG.
 | | ...
-| | Given Configure path in 2-node circular topology | ${nodes['TG']}
+| | 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 Set interfaces in 2-node circular topology up
 | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} |
@@ -98,7 +100,10 @@
 | | ... | [Ver] Packet sent from TG gets to the destination and ICMP-reply is\
 | | ... | received on TG.
 | | ...
-| | Given Configure path in 2-node circular topology | ${nodes['TG']}
+| | 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 Set interfaces in 2-node circular topology up
 | | ${int1}= | And Add Tap Interface | ${dut_node} | ${tap_int1} |