From 8f285166faf13156a4f7c70adac9a7e20549268f Mon Sep 17 00:00:00 2001
From: Stefan Kobza <skobza@cisco.com>
Date: Wed, 10 Feb 2016 19:41:09 +0100
Subject: Test VIRL connection.

Change-Id: I812ff9c8c9669b63907469c643c839e8bd3b419a
Signed-off-by: Stefan Kobza <skobza@cisco.com>
---
 tests/suites/__init__.robot                         | 1 +
 tests/suites/bridge_domain/test.robot               | 5 ++---
 tests/suites/ipv6/ipv6_untagged.robot               | 1 -
 tests/suites/l2_xconnect/l2_xconnect_untagged.robot | 1 +
 tests/suites/performance/short.robot                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests/suites')

diff --git a/tests/suites/__init__.robot b/tests/suites/__init__.robot
index fc3c810e39..64f4a99de8 100644
--- a/tests/suites/__init__.robot
+++ b/tests/suites/__init__.robot
@@ -16,5 +16,6 @@
 | Library | resources/libraries/python/SetupFramework.py
 | Library | resources.libraries.python.topology.Topology
 | Suite Setup | Run Keywords | Setup Framework | ${nodes}
+| ...         | AND          | Start VPP Service On All DUTs | ${nodes}
 | ...         | AND          | Update All Interface Data On All Nodes | ${nodes}
 
diff --git a/tests/suites/bridge_domain/test.robot b/tests/suites/bridge_domain/test.robot
index 108e2aa4dd..4c88cae7b8 100644
--- a/tests/suites/bridge_domain/test.robot
+++ b/tests/suites/bridge_domain/test.robot
@@ -17,7 +17,6 @@
 | Test Setup | Setup all DUTs before test
 | Library | resources.libraries.python.topology.Topology
 | Variables | resources/libraries/python/topology.py
-| Force Tags | 3_NODE_DOUBLE_LINK_TOPO
 | Suite Setup | Setup all TGs before traffic script
 
 *** Test Cases ***
@@ -37,7 +36,7 @@
 | | ${dut1}= | Set Variable | ${nodes['DUT1']}
 | | ${dut2}= | Set Variable | ${nodes['DUT2']}
 | | ${tg_links}= | Setup TG "${tg}" DUT1 "${dut1}" and DUT2 "${dut2}" for 3 node l2 bridge domain test
-| | Sleep | 5 | Workaround for interface still in down state after vpp restart
+| | Sleep | 10 | Workaround for interface still in down state after vpp restart
 | | Send traffic on node "${nodes['TG']}" from link "${tg_links[0]}" to link "${tg_links[1]}"
 
 | Vpp forwards packets via L2 bridge domain in circular topology with static L2FIB entries
@@ -46,5 +45,5 @@
 | | ${dut1}= | Set Variable | ${nodes['DUT1']}
 | | ${dut2}= | Set Variable | ${nodes['DUT2']}
 | | ${tg_links}= | Setup TG "${tg}" DUT1 "${dut1}" and DUT2 "${dut2}" for 3 node static l2fib test
-| | Sleep | 5 | Workaround for interface still in down state after vpp restart
+| | Sleep | 10 | Workaround for interface still in down state after vpp restart
 | | Send traffic on node "${nodes['TG']}" from link "${tg_links[0]}" to link "${tg_links[1]}"
diff --git a/tests/suites/ipv6/ipv6_untagged.robot b/tests/suites/ipv6/ipv6_untagged.robot
index 6f8b9c093e..e804addaf9 100644
--- a/tests/suites/ipv6/ipv6_untagged.robot
+++ b/tests/suites/ipv6/ipv6_untagged.robot
@@ -23,7 +23,6 @@
 | ...         | AND          | Vpp nodes ra supress link layer | ${nodes}
 | ...         | AND          | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr}
 | ...         | AND          | Setup all TGs before traffic script
-| Suite Teardown | Clear ipv6 on all dut in topology | ${nodes} | ${nodes_ipv6_addr}
 | Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes}
 
 *** Test Cases ***
diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
index 36f49b30d8..286a63e9f4 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
@@ -28,5 +28,6 @@
 | | ${dut1}= | Set Variable | ${nodes['DUT1']}
 | | ${dut2}= | Set Variable | ${nodes['DUT2']}
 | | ${tg_links}= | Get traffic links between TG "${tg}" and DUT1 "${dut1}" and DUT2 "${dut2}"
+| | Sleep | 10 | Work around VPP interface up taking too long.
 | | Send traffic on node "${nodes['TG']}" from link "${tg_links[0]}" to link "${tg_links[1]}"
 
diff --git a/tests/suites/performance/short.robot b/tests/suites/performance/short.robot
index 3d29485d7d..15143778ab 100644
--- a/tests/suites/performance/short.robot
+++ b/tests/suites/performance/short.robot
@@ -17,7 +17,7 @@
 | Resource | resources/libraries/robot/ipv4.robot
 | Library | resources/libraries/python/TrafficGenerator.py
 | Library | resources/libraries/python/CrossConnectSetup.py
-| Force Tags | topo-3node
+| Force Tags | topo-3node | PERFTEST
 | Test Setup | Setup all DUTs before test
 | Suite Setup | Initialize traffic generator | ${nodes['TG']}
 | ... | ${nodes['TG']['interfaces']['port3']['pci_address']}
-- 
cgit 1.2.3-korg