aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTibor Frank <tifrank@cisco.com>2016-07-22 09:50:03 +0200
committerMatej Klotton <mklotton@cisco.com>2016-07-22 09:15:23 +0000
commitdec1188c7f89f5f8f97085b5f68c6f1d918586b8 (patch)
tree95d79281e92cb5cd5a64dda10991d71d852664f9
parent9c8743594ac51c51ac14b6b80c9806a79ada0753 (diff)
CSIT-219: Realocate resources for Honeycomb tests
- move the resources to resources/test_data/honeycomb Change-Id: I77c1bd5707f557799a7a189a9c695c50e5471621 Signed-off-by: Tibor Frank <tifrank@cisco.com>
-rw-r--r--resources/libraries/robot/honeycomb/netconf.robot2
-rw-r--r--resources/libraries/robot/honeycomb/notifications.robot4
-rw-r--r--resources/libraries/robot/honeycomb/persistence.robot2
-rw-r--r--resources/test_data/honeycomb/acl.py (renamed from tests/suites/honeycomb/resources/acl.py)0
-rw-r--r--resources/test_data/honeycomb/l2_fib.py (renamed from tests/suites/honeycomb/resources/l2_fib.py)0
-rw-r--r--resources/test_data/honeycomb/netconf/hello.py (renamed from tests/suites/honeycomb/resources/netconf/hello.py)0
-rw-r--r--resources/test_data/honeycomb/netconf/subscription.py (renamed from tests/suites/honeycomb/resources/netconf/subscription.py)0
-rw-r--r--resources/test_data/honeycomb/netconf/triggers.py (renamed from tests/suites/honeycomb/resources/netconf/triggers.py)0
-rw-r--r--resources/test_data/honeycomb/persistence.py (renamed from tests/suites/honeycomb/resources/persistence.py)0
-rw-r--r--resources/test_data/honeycomb/sub_interfaces.py (renamed from tests/suites/honeycomb/resources/sub_interfaces.py)0
-rw-r--r--resources/test_data/honeycomb/vxlan.py (renamed from tests/suites/honeycomb/resources/vxlan.py)0
-rw-r--r--resources/test_data/honeycomb/vxlan_gpe.py (renamed from tests/suites/honeycomb/resources/vxlan_gpe.py)0
-rw-r--r--tests/suites/honeycomb/021_l2_fib.robot2
-rw-r--r--tests/suites/honeycomb/030_vxlan.robot2
-rw-r--r--tests/suites/honeycomb/031_vxlan_gpe.robot2
-rw-r--r--tests/suites/honeycomb/060_sub_interface.robot2
-rw-r--r--tests/suites/honeycomb/070_netconf.robot2
-rw-r--r--tests/suites/honeycomb/080_access_control_lists.robot2
18 files changed, 10 insertions, 10 deletions
diff --git a/resources/libraries/robot/honeycomb/netconf.robot b/resources/libraries/robot/honeycomb/netconf.robot
index ce7b6a6b38..79fa0a312c 100644
--- a/resources/libraries/robot/honeycomb/netconf.robot
+++ b/resources/libraries/robot/honeycomb/netconf.robot
@@ -13,7 +13,7 @@
*** Settings ***
| Library | resources.libraries.python.honeycomb.Netconf
-| Variables | tests/suites/honeycomb/resources/netconf/hello.py
+| Variables | resources/test_data/honeycomb/netconf/hello.py
| Documentation | Keywords for managing Netconf communication.
*** Keywords ***
diff --git a/resources/libraries/robot/honeycomb/notifications.robot b/resources/libraries/robot/honeycomb/notifications.robot
index 119a351e7d..125e06c7a1 100644
--- a/resources/libraries/robot/honeycomb/notifications.robot
+++ b/resources/libraries/robot/honeycomb/notifications.robot
@@ -13,8 +13,8 @@
*** Settings ***
| Library | resources.libraries.python.honeycomb.Notifications
-| Variables | tests/suites/honeycomb/resources/netconf/hello.py
-| Variables | tests/suites/honeycomb/resources/netconf/subscription.py
+| Variables | resources/test_data/honeycomb/netconf/hello.py
+| Variables | resources/test_data/honeycomb/netconf/subscription.py
| Documentation | Keywords used to test Honeycomb notifications over Netconf.
*** Keywords ***
diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot
index 1390254bc4..aacf560f1d 100644
--- a/resources/libraries/robot/honeycomb/persistence.robot
+++ b/resources/libraries/robot/honeycomb/persistence.robot
@@ -22,7 +22,7 @@
| Resource | resources/libraries/robot/honeycomb/tap.robot
| Resource | resources/libraries/robot/honeycomb/vhost_user.robot
| Resource | resources/libraries/robot/honeycomb/sub_interface.robot
-| Variables | tests/suites/honeycomb/resources/persistence.py | ${interface}
+| Variables | resources/test_data/honeycomb/persistence.py | ${interface}
| Documentation | Keywords used to test Honeycomb persistence.
*** Keywords ***
diff --git a/tests/suites/honeycomb/resources/acl.py b/resources/test_data/honeycomb/acl.py
index 227330c2a9..227330c2a9 100644
--- a/tests/suites/honeycomb/resources/acl.py
+++ b/resources/test_data/honeycomb/acl.py
diff --git a/tests/suites/honeycomb/resources/l2_fib.py b/resources/test_data/honeycomb/l2_fib.py
index b06193ad1d..b06193ad1d 100644
--- a/tests/suites/honeycomb/resources/l2_fib.py
+++ b/resources/test_data/honeycomb/l2_fib.py
diff --git a/tests/suites/honeycomb/resources/netconf/hello.py b/resources/test_data/honeycomb/netconf/hello.py
index 2cc89b387c..2cc89b387c 100644
--- a/tests/suites/honeycomb/resources/netconf/hello.py
+++ b/resources/test_data/honeycomb/netconf/hello.py
diff --git a/tests/suites/honeycomb/resources/netconf/subscription.py b/resources/test_data/honeycomb/netconf/subscription.py
index ccf8c47022..ccf8c47022 100644
--- a/tests/suites/honeycomb/resources/netconf/subscription.py
+++ b/resources/test_data/honeycomb/netconf/subscription.py
diff --git a/tests/suites/honeycomb/resources/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py
index 77596bd052..77596bd052 100644
--- a/tests/suites/honeycomb/resources/netconf/triggers.py
+++ b/resources/test_data/honeycomb/netconf/triggers.py
diff --git a/tests/suites/honeycomb/resources/persistence.py b/resources/test_data/honeycomb/persistence.py
index f46cfba597..f46cfba597 100644
--- a/tests/suites/honeycomb/resources/persistence.py
+++ b/resources/test_data/honeycomb/persistence.py
diff --git a/tests/suites/honeycomb/resources/sub_interfaces.py b/resources/test_data/honeycomb/sub_interfaces.py
index 6904b48015..6904b48015 100644
--- a/tests/suites/honeycomb/resources/sub_interfaces.py
+++ b/resources/test_data/honeycomb/sub_interfaces.py
diff --git a/tests/suites/honeycomb/resources/vxlan.py b/resources/test_data/honeycomb/vxlan.py
index 43307aa61a..43307aa61a 100644
--- a/tests/suites/honeycomb/resources/vxlan.py
+++ b/resources/test_data/honeycomb/vxlan.py
diff --git a/tests/suites/honeycomb/resources/vxlan_gpe.py b/resources/test_data/honeycomb/vxlan_gpe.py
index 308cd0a316..308cd0a316 100644
--- a/tests/suites/honeycomb/resources/vxlan_gpe.py
+++ b/resources/test_data/honeycomb/vxlan_gpe.py
diff --git a/tests/suites/honeycomb/021_l2_fib.robot b/tests/suites/honeycomb/021_l2_fib.robot
index c994ad3b5b..ec07e104ad 100644
--- a/tests/suites/honeycomb/021_l2_fib.robot
+++ b/tests/suites/honeycomb/021_l2_fib.robot
@@ -16,7 +16,7 @@
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
| Resource | resources/libraries/robot/honeycomb/l2_fib.robot
-| Variables | tests/suites/honeycomb/resources/l2_fib.py
+| Variables | resources/test_data/honeycomb/l2_fib.py
| Documentation | *Honeycomb L2 FIB management test suite.*
| Suite Setup | Run keywords
| ... | Set test interface down
diff --git a/tests/suites/honeycomb/030_vxlan.robot b/tests/suites/honeycomb/030_vxlan.robot
index 03a3d71cd5..7e192cea47 100644
--- a/tests/suites/honeycomb/030_vxlan.robot
+++ b/tests/suites/honeycomb/030_vxlan.robot
@@ -30,7 +30,7 @@
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/vxlan.robot
# import additional VxLAN settings from resource file
-| Variables | tests/suites/honeycomb/resources/vxlan.py
+| Variables | resources/test_data/honeycomb/vxlan.py
| Force Tags | honeycomb_sanity
| Documentation | *Honeycomb VxLAN management test suite.*
| ...
diff --git a/tests/suites/honeycomb/031_vxlan_gpe.robot b/tests/suites/honeycomb/031_vxlan_gpe.robot
index ec2ef3a518..5c51319070 100644
--- a/tests/suites/honeycomb/031_vxlan_gpe.robot
+++ b/tests/suites/honeycomb/031_vxlan_gpe.robot
@@ -36,7 +36,7 @@
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/vxlan_gpe.robot
# Import additional VxLAN GPE settings from resource file
-| Variables | tests/suites/honeycomb/resources/vxlan_gpe.py
+| Variables | resources/test_data/honeycomb/vxlan_gpe.py
| Documentation | *Honeycomb VxLAN-GPE management test suite.*
| Force Tags | honeycomb_sanity
diff --git a/tests/suites/honeycomb/060_sub_interface.robot b/tests/suites/honeycomb/060_sub_interface.robot
index 595bbde2b7..e67638ab97 100644
--- a/tests/suites/honeycomb/060_sub_interface.robot
+++ b/tests/suites/honeycomb/060_sub_interface.robot
@@ -16,7 +16,7 @@
| Resource | resources/libraries/robot/honeycomb/sub_interface.robot
| Resource | resources/libraries/robot/honeycomb/bridge_domain.robot
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
-| Variables | tests/suites/honeycomb/resources/sub_interfaces.py
+| Variables | resources/test_data/honeycomb/sub_interfaces.py
| Suite Teardown | Honeycomb removes all bridge domains | ${node}
| Force Tags | honeycomb_sanity
| Documentation | *Honeycomb sub-interface management test suite.*
diff --git a/tests/suites/honeycomb/070_netconf.robot b/tests/suites/honeycomb/070_netconf.robot
index 998b550bf6..9925dee15f 100644
--- a/tests/suites/honeycomb/070_netconf.robot
+++ b/tests/suites/honeycomb/070_netconf.robot
@@ -14,7 +14,7 @@
*** Settings ***
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/honeycomb/netconf.robot
-| Variables | tests/suites/honeycomb/resources/netconf/triggers.py
+| Variables | resources/test_data/honeycomb/netconf/triggers.py
| Documentation | *Netconf test suite. Contains test cases that need to bypass\
| ... | REST API.*
| Force Tags | honeycomb_sanity
diff --git a/tests/suites/honeycomb/080_access_control_lists.robot b/tests/suites/honeycomb/080_access_control_lists.robot
index 84dc42ee75..146a02edd3 100644
--- a/tests/suites/honeycomb/080_access_control_lists.robot
+++ b/tests/suites/honeycomb/080_access_control_lists.robot
@@ -18,7 +18,7 @@
*** Settings ***
| Resource | resources/libraries/robot/default.robot
| Resource | resources/libraries/robot/honeycomb/access_control_lists.robot
-| Variables | tests/suites/honeycomb/resources/acl.py
+| Variables | resources/test_data/honeycomb/acl.py
| Suite Teardown | Clear all ACL settings | ${node}
| Documentation | *Honeycomb access control lists test suite.*
| Force Tags | Honeycomb_sanity