Rename Honeycomb test suites

 - update test suite numbering to be future-proof
 - reorder suite execution:
   - persistence suite should always run last
   - l2_fib suite follows after l2
   - VxLAN gpe suite follows after VxLAN
 - fix issue with interface name vs. index introduced in change #1032
 - change ${node} variable to global scope, set in _init_.robot

Change-Id: Ib4ca7265586026faab219da9923e7ca312ef2c79
Signed-off-by: selias <samelias@cisco.com>

11 files changed, 14 insertions, 22 deletions

diff --git a/tests/suites/honeycomb/1 - interface_management.robot b/tests/suites/honeycomb/010_interface_management.robot
index 01be01a6b0..e9798167c7 100644
--- a/tests/suites/honeycomb/1 - interface_management.robot
+++ b/tests/suites/honeycomb/010_interface_management.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interface to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interface to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 # Configuration which will be set and verified during tests.
 | ${ipv4_address}= | 192.168.0.2
diff --git a/tests/suites/honeycomb/3 - bridge_domain.robot b/tests/suites/honeycomb/020_bridge_domain.robot
index c2986b65b7..0bd4463ea0 100644
--- a/tests/suites/honeycomb/3 - bridge_domain.robot
+++ b/tests/suites/honeycomb/020_bridge_domain.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interfaces to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interfaces to run tests on.
 | @{interfaces}= | ${node['interfaces']['port1']['name']}
 | ... | ${node['interfaces']['port3']['name']}
 # Configuration which will be set and verified during tests.
diff --git a/tests/suites/honeycomb/9 - l2_fib.robot b/tests/suites/honeycomb/021_l2_fib.robot
index bc56f4e85c..c994ad3b5b 100644
--- a/tests/suites/honeycomb/9 - l2_fib.robot
+++ b/tests/suites/honeycomb/021_l2_fib.robot
@@ -26,9 +26,8 @@
 | Force tags | honeycomb_sanity
 
 *** Variables ***
-# Node and interface used in tests.
-| ${node}= | ${nodes['DUT1']}
-| ${interface}= | GigabitEthernet0/8/0
+# Interface to run tests on.
+| ${interface}= | ${node['interfaces']['port1']['name']}
 
 *** Test Cases ***
 | Honeycomb adds L2 FIB entry (forward)
diff --git a/tests/suites/honeycomb/2 - vxlan.robot b/tests/suites/honeycomb/030_vxlan.robot
index c49c14c9f8..03a3d71cd5 100644
--- a/tests/suites/honeycomb/2 - vxlan.robot
+++ b/tests/suites/honeycomb/030_vxlan.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interfaces to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interfaces to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${vx_interface}= | vx_tunnel_test
 # Configuration which will be set and verified during tests.
diff --git a/tests/suites/honeycomb/8 - vxlan_gpe.robot b/tests/suites/honeycomb/031_vxlan_gpe.robot
index 0031a0a92d..ec2ef3a518 100644
--- a/tests/suites/honeycomb/8 - vxlan_gpe.robot
+++ b/tests/suites/honeycomb/031_vxlan_gpe.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interfaces to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interface to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 
 # Parameters to be set on existing interface
diff --git a/tests/suites/honeycomb/4 - tap.robot b/tests/suites/honeycomb/040_tap.robot
index 4bce990ee8..329ca8a3c1 100644
--- a/tests/suites/honeycomb/4 - tap.robot
+++ b/tests/suites/honeycomb/040_tap.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interfaces to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interfaces to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${tap_interface}= | tap_test
 # Configuration which will be set and verified during tests.
diff --git a/tests/suites/honeycomb/5 - interface_vhost_user.robot b/tests/suites/honeycomb/050_interface_vhost_user.robot
index bba026ebc4..2c2a5ae91a 100644
--- a/tests/suites/honeycomb/5 - interface_vhost_user.robot
+++ b/tests/suites/honeycomb/050_interface_vhost_user.robot
@@ -12,7 +12,6 @@
 # limitations under the License.
 
 *** Variables ***
-| ${node}= | ${nodes['DUT1']}
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${vhost_interface}= | test_vhost
 | &{vhost_user_server}= | socket=soc1 | role=server
diff --git a/tests/suites/honeycomb/6 - sub_interface.robot b/tests/suites/honeycomb/060_sub_interface.robot
index 0ad6deb0d6..8f43a52e2e 100644
--- a/tests/suites/honeycomb/6 - sub_interface.robot
+++ b/tests/suites/honeycomb/060_sub_interface.robot
@@ -25,8 +25,6 @@
 | ...           | delete a sub-interface.
 
 *** Variables ***
-| ${node}= | ${nodes['DUT1']}
-
 # Test interface 1 and its sub-interface parameters:
 | ${super_if}= | ${node['interfaces']['port1']['name']}
 | ${sub_if_id}= | ${sub_if_1_settings['identifier']}
@@ -36,7 +34,8 @@
 | Honycomb creates sub-interface
 | | [Documentation] | Check if Honeycomb creates a sub-interface.
 | | ...
-| | Given sub-interface configuration from Honeycomb should be empty
+| | Given interface state is | ${node} | ${super_if} | down
+| | And sub-interface configuration from Honeycomb should be empty
 | | ... | ${node} | ${super_if} | ${sub_if_id}
 | | And interface configuration from VAT should be empty
 | | ... | ${node} | ${sub_if_name}
diff --git a/tests/suites/honeycomb/9 - notification.robot b/tests/suites/honeycomb/070_notification.robot
index 5769ea0e73..117f024b21 100644
--- a/tests/suites/honeycomb/9 - notification.robot
+++ b/tests/suites/honeycomb/070_notification.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables ***
-# Node and interfaces to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interfaces to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${tap_interface}= | tap_test
 | &{tap_settings}= | tap-name=tap_test | mac=08:00:27:c0:5d:37
diff --git a/tests/suites/honeycomb/7 - persistence.robot b/tests/suites/honeycomb/900_persistence.robot
index ad0aeced8d..e3f68ccc33 100644
--- a/tests/suites/honeycomb/7 - persistence.robot
+++ b/tests/suites/honeycomb/900_persistence.robot
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 *** Variables***
-# Node and interface to run tests on.
-| ${node}= | ${nodes['DUT1']}
+# Interface to run tests on.
 | ${interface}= | ${node['interfaces']['port1']['name']}
 
 *** Settings ***
diff --git a/tests/suites/honeycomb/__init__.robot b/tests/suites/honeycomb/__init__.robot
index 264f604599..d38852a090 100644
--- a/tests/suites/honeycomb/__init__.robot
+++ b/tests/suites/honeycomb/__init__.robot
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 *** Variables***
+# Honeycomb node to run tests on.
 | ${node}= | ${nodes['DUT1']}
 
 *** Settings ***
@@ -20,5 +21,6 @@
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Suite Setup | Run keywords | Setup all DUTs before test | AND
 | ... | Clear persisted Honeycomb configuration | ${node} | AND
-| ... | Setup Honeycomb service on DUTs | ${node}
+| ... | Setup Honeycomb service on DUTs | ${node} | AND
+| ... | Set Global Variable | ${node}
 | Suite Teardown | Stop Honeycomb service on DUTs | ${node}