aboutsummaryrefslogtreecommitdiffstats
path: root/tests/suites
diff options
context:
space:
mode:
authorMatej Klotton <mklotton@cisco.com>2016-03-23 15:01:30 +0100
committerGerrit Code Review <gerrit@fd.io>2016-04-13 16:08:13 +0000
commit5a2fd159dce96a70f2e5157314391aceb6d80197 (patch)
treeef92201cd4af16786aec3bc497142d84539c08e1 /tests/suites
parent3121b691debad27fcea1c6e2031e4a2544e42fbf (diff)
Move methods from topology.py to more appropriate place.
Change-Id: I2612a9466095b3d79a4a9d938fcdbf9f93133f69 Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'tests/suites')
-rw-r--r--tests/suites/__init__.robot5
-rw-r--r--tests/suites/bridge_domain/test.robot2
-rw-r--r--tests/suites/ipv4/ipv4_untagged.robot1
-rw-r--r--tests/suites/l2_xconnect/l2_xconnect_untagged.robot2
4 files changed, 3 insertions, 7 deletions
diff --git a/tests/suites/__init__.robot b/tests/suites/__init__.robot
index e025575dd7..2016146e3b 100644
--- a/tests/suites/__init__.robot
+++ b/tests/suites/__init__.robot
@@ -13,9 +13,8 @@
*** Settings ***
| Resource | resources/libraries/robot/default.robot
-| Library | resources/libraries/python/SetupFramework.py
-| Library | resources.libraries.python.topology.Topology
+| Resource | resources/libraries/robot/interfaces.robot
+| Library | resources.libraries.python.SetupFramework
| Suite Setup | Run Keywords | Setup Framework | ${nodes}
| ... | AND | Setup 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 9695b7fe88..c6a4cd1197 100644
--- a/tests/suites/bridge_domain/test.robot
+++ b/tests/suites/bridge_domain/test.robot
@@ -16,9 +16,7 @@
| Resource | resources/libraries/robot/interfaces.robot
| Resource | resources/libraries/robot/bridge_domain.robot
| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.topology.Topology
| Library | resources.libraries.python.NodePath
-| Variables | resources/libraries/python/topology.py
| Force Tags | HW_ENV | VM_ENV
| Suite Setup | Setup all TGs before traffic script
| Test Setup | Setup all DUTs before test
diff --git a/tests/suites/ipv4/ipv4_untagged.robot b/tests/suites/ipv4/ipv4_untagged.robot
index 47fe34acdf..45ab5768c7 100644
--- a/tests/suites/ipv4/ipv4_untagged.robot
+++ b/tests/suites/ipv4/ipv4_untagged.robot
@@ -12,7 +12,6 @@
# limitations under the License.
*** Settings ***
-| Library | resources.libraries.python.topology.Topology
| Library | resources.libraries.python.NodePath
| Library | resources.libraries.python.Trace
| Resource | resources/libraries/robot/default.robot
diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
index cf32bfa076..3370cabaa4 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
@@ -15,7 +15,7 @@
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/l2_xconnect.robot
| Resource | resources/libraries/robot/l2_traffic.robot
-| Library | resources.libraries.python.InterfaceUtil
+| Resource | resources/libraries/robot/interfaces.robot
| Library | resources.libraries.python.NodePath
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | HW_ENV | VM_ENV
| Test Setup | Setup all DUTs before test