From: selias <samelias@cisco.com>
Date: Mon, 23 Jan 2017 17:14:46 +0000 (+0100)
Subject: csit-func-hc naming change
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=20a24b36a6fc172c209dcc154e138f6e06e85bd5

csit-func-hc naming change

 - change test suite filenames
 - add numbering to all test cases

more details at https://wiki.fd.io/view/CSIT/csit-perf-tc-naming-change

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

diff --git a/tests/func/honeycomb/080_access_control_lists.robot b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot
similarity index 94%
rename from tests/func/honeycomb/080_access_control_lists.robot
rename to tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot
index 566ec44f14..98ff3bda13 100644
--- a/tests/func/honeycomb/080_access_control_lists.robot
+++ b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot
@@ -28,7 +28,7 @@
 | Force Tags | Honeycomb_sanity
 
 *** Test Cases ***
-| Honeycomb can create ACL classify table
+| TC01: Honeycomb can create ACL classify table
 | | [Documentation] | Check if Honeycomb API can create an ACL table.
 | | Given ACL table from Honeycomb should not exist
 | | ... | ${node} | ${hc_acl_table['name']}
@@ -40,7 +40,7 @@
 | | And ACL table from VAT should be
 | | ... | ${node} | ${table_index} | ${vat_acl_table}
 
-| Honeycomb can remove ACL table
+| TC02: Honeycomb can remove ACL table
 | | [Documentation] | Check if Honeycomb API can delete an ACL table.
 | | Given ACL table from Honeycomb should be | ${node} | ${hc_acl_table}
 | | And ACL table from VAT should be
@@ -51,7 +51,7 @@
 | | And ACL table from VAT should not exist
 | | ... | ${node} | ${table_index}
 
-| Honeycomb manages more than one ACL table
+| TC03: Honeycomb manages more than one ACL table
 | | [Documentation] | Check if Honeycomb API can create another ACL table.
 | | Given ACL table from Honeycomb should not exist
 | | ... | ${node} | ${hc_acl_table['name']}
@@ -66,7 +66,7 @@
 | | And ACL table from VAT should be
 | | ... | ${node} | ${table_index2} | ${vat_acl_table2}
 
-| Honeycomb can add ACL session to table
+| TC04: Honeycomb can add ACL session to table
 | | [Documentation] | Check if Honeycomb API can add an ACL session to a table.
 | | Given ACL table from Honeycomb should be | ${node} | ${hc_acl_table}
 | | And ACL table from VAT should be
@@ -78,7 +78,7 @@
 | | And ACL session from VAT should be
 | | ... | ${node} | ${table_index} | ${session_index} | ${vat_acl_session}
 
-| Honeycomb can remove ACL session
+| TC05: Honeycomb can remove ACL session
 | | [Documentation] | Check if Honeycomb API can remove an ACL session.
 | | Given ACL session from Honeycomb should be
 | | ... | ${node} | ${hc_acl_table['name']} | ${hc_acl_session}
@@ -91,7 +91,7 @@
 | | And ACL session from VAT should not exist
 | | ... | ${node} | ${table_index} | ${session_index}
 
-| Honeycomb manages more than one ACL session on one table
+| TC06: Honeycomb manages more than one ACL session on one table
 | | [Documentation] | Check if Honeycomb API can add another ACL session\
 | | ... | to a table.
 | | Given ACL session from Honeycomb should not exist
@@ -111,7 +111,7 @@
 | | And ACL session from VAT should be
 | | ... | ${node} | ${table_index} | ${session_index2} | ${vat_acl_session2}
 
-| Honeycomb enables ACL on interface
+| TC07: Honeycomb enables ACL on interface
 | | [Documentation] | Check if Honeycomb API can enable ACL on an interface.
 | | Given ACL table from Honeycomb should be | ${node} | ${hc_acl_table}
 | | And ACL table from VAT should be
@@ -127,7 +127,7 @@
 | | And Interface ACL settings from VAT should be
 | | ... | ${node} | ${interface} | ${table_index}
 
-| Honeycomb disables ACL on interface
+| TC08: Honeycomb disables ACL on interface
 | | [Documentation] | Check if Honeycomb API can disable ACL on an interface.
 | | Given Interface ACL settings from Honeycomb should be
 | | ... | ${node} | ${interface} | ${hc_acl_table['name']}
@@ -139,7 +139,7 @@
 | | And Interface ACL settings from VAT should be empty
 | | ... | ${node} | ${interface}
 
-| Honeycomb can remove one out of multiple ACL tables
+| TC09: Honeycomb can remove one out of multiple ACL tables
 | | [Documentation] | Check if Honeycomb API can delete an ACL table if more\
 | | ... | than one table exists.
 # Attempting to remove one ACL table removes all of them (VPP-206)
diff --git a/tests/func/honeycomb/081_ietf_acl_traffic.robot b/tests/func/honeycomb/mgmt-cfg-ietfacl-apihc-apivat-func.robot
similarity index 100%
rename from tests/func/honeycomb/081_ietf_acl_traffic.robot
rename to tests/func/honeycomb/mgmt-cfg-ietfacl-apihc-apivat-func.robot
diff --git a/tests/func/honeycomb/070_netconf.robot b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot
similarity index 95%
rename from tests/func/honeycomb/070_netconf.robot
rename to tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot
index f74947ccf0..118a4c67f7 100644
--- a/tests/func/honeycomb/070_netconf.robot
+++ b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot
@@ -30,7 +30,7 @@
 | ... | unknown-unicast-flood=${True} | arp-termination=${True}
 
 *** Test Cases ***
-| Honeycomb can create and delete interfaces
+| TC01: Honeycomb can create and delete interfaces
 | | [Documentation] | Repeatedly create and delete an interface through Netconf\
 | | ... | and check the reply for any errors.
 | | Given Netconf session is established | ${node}
@@ -40,7 +40,7 @@
 | | | When Error trigger is sent | ${trigger_105}
 | | | Then Replies should not contain RPC errors
 
-| Transaction revert test case 1
+| TC02: Transaction revert test case 1
 | | [Documentation] | Configure two conflicting VxLAN tunnels, then verify\
 | | ... | that neither tunnel exists.
 | | Given Netconf session is established | ${node}
@@ -49,7 +49,7 @@
 | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node}
 | | Then Should be equal | ${if_data} | ${if_data_new}
 
-| Transaction revert test case 2
+| TC03: Transaction revert test case 2
 | | [Documentation] | Configure two conflicting TAP interfaces, then verify\
 | | ... | that neither interface exists.
 | | Given Netconf session is established | ${node}
diff --git a/tests/func/honeycomb/060_sub_interface.robot b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
similarity index 95%
rename from tests/func/honeycomb/060_sub_interface.robot
rename to tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
index 9e58f2766d..9e2216b6a4 100644
--- a/tests/func/honeycomb/060_sub_interface.robot
+++ b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
@@ -35,7 +35,7 @@
 | ${sub_if_name}= | ${super_if}.${sub_if_id}
 
 *** Test Cases ***
-| Honycomb creates sub-interface
+| TC01: Honycomb creates sub-interface
 | | [Documentation] | Check if Honeycomb creates a sub-interface.
 | | ...
 | | Given Honeycomb sets interface state | ${node} | ${super_if} | down
@@ -52,7 +52,7 @@
 | | And sub-interface indices from Honeycomb and VAT should correspond
 | | ... | ${node} | ${super_if} | ${sub_if_id}
 
-| Honeycomb sets interface and sub-interface up
+| TC02: Honeycomb sets interface and sub-interface up
 | | [Documentation] | Honeycomb changes the state of interface\
 | | ... | and of its sub-interface to up.
 | | ...
@@ -77,7 +77,7 @@
 | | And sub-interface state from VAT should be
 | | ... | ${node} | ${sub_if_name} | up | up
 
-| Honeycomb sets sub-interface down while its super-interface is up
+| TC03: Honeycomb sets sub-interface down while its super-interface is up
 | | [Documentation] | Honeycomb sets the sub-interface down while its \
 | | ... | super-interface is up. It must be possible.
 | | ...
@@ -103,7 +103,7 @@
 | | And sub-interface state from VAT should be
 | | ... | ${node} | ${sub_if_name} | down | up
 
-| Honeycomb sets interface and sub-interface down
+| TC04: Honeycomb sets interface and sub-interface down
 | | [Documentation] | Honeycomb changes the state of interface down and then \
 | | ... | changes the state of its sub-interface down, in this order.
 | | ...
@@ -131,7 +131,7 @@
 | | And sub-interface state from VAT should be
 | | ... | ${node} | ${sub_if_name} | down | down
 
-| Honeycomb fails to set sub-interface up while its super-interface is down
+| TC05: Honeycomb fails to set sub-interface up while its super-interface is down
 | | [Documentation] | Honeycomb tries to set the sub-interface up while its \
 | | ... | super-interface is down. It must not be possible.
 | | ...
@@ -154,7 +154,7 @@
 | | And sub-interface state from VAT should be
 | | ... | ${node} | ${sub_if_name} | down | down
 
-| Honeycomb fails to delete sub-interface
+| TC06: Honeycomb fails to delete sub-interface
 | | [Documentation] | Check if Honeycomb can delete an existing sub-interface.
 | | ...
 | | [Setup] | Set super and sub interfaces down
@@ -171,7 +171,7 @@
 | | And sub-interface configuration from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
 
-| Honeycomb adds sub-interface to new bridge domain
+| TC07: Honeycomb adds sub-interface to new bridge domain
 | | [Documentation] | Check if Honeycomb adds a sub-interface to bridge domain.
 | | ...
 | | [Setup] | Set super and sub interfaces down
@@ -194,7 +194,7 @@
 | | And sub-interface configuration from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${sub_if_1_oper}
 
-| Honeycomb enables tag-rewrite pop 1
+| TC08: Honeycomb enables tag-rewrite pop 1
 | | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its \
 | | ... | parameters correctly. Case: pop 1.
 | | ...
@@ -210,7 +210,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
 
-| Honeycomb enables tag-rewrite push
+| TC09: Honeycomb enables tag-rewrite push
 | | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its \
 | | ... | parameters correctly. Case: push.
 | | ...
@@ -226,7 +226,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_push_VAT}
 
-| Honeycomb enables tag-rewrite translate 1-2
+| TC10: Honeycomb enables tag-rewrite translate 1-2
 | | [Documentation] | Check if Honeycomb enables tag-rewrite and sets its \
 | | ... | parameters correctly. Case: translate 1-2.
 | | ...
@@ -243,7 +243,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_translate_1_2_VAT}
 
-| Honeycomb disables tag-rewrite
+| TC11: Honeycomb disables tag-rewrite
 | | [Documentation] | Check if Honeycomb disables the tag-rewrite.
 | | ...
 | | [Teardown] | Honeycomb disables tag rewrite
@@ -260,7 +260,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
 
-| Honeycomb enables tag-rewrite pop 1 again
+| TC12: Honeycomb enables tag-rewrite pop 1 again
 | | [Documentation] | Check if Honeycomb can enable tag-rewrite again, once it \
 | | ... | was disabled by Honeycomb.
 | | ...
@@ -276,7 +276,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_pop_1_VAT}
 
-| Honeycomb modifies the tag-rewrite
+| TC13: Honeycomb modifies the tag-rewrite
 | | [Documentation] | Honeycomb sets the tag-rewrite:
 | | ... | 1. pop 1, then
 | | ... | 2. push, then
@@ -314,7 +314,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
 
-| Honeycomb fails to set wrong vlan-type in tag-rewrite
+| TC14: Honeycomb fails to set wrong vlan-type in tag-rewrite
 | | [Documentation] | Check that Honeycomb does not accept wrong values of \
 | | ... | vlan-type in tag-rewrite.
 | | ...
@@ -328,7 +328,7 @@
 | | And rewrite tag from VAT should be
 | | ... | ${node} | ${sub_if_name} | ${tag_rewrite_disabled_VAT}
 
-| Honeycomb configures sub-interface ipv4 address
+| TC15: Honeycomb configures sub-interface ipv4 address
 | | [Documentation] | Check if Honeycomb can configure an ipv4 address on the\
 | | ... | sub-interface.
 | | ...
@@ -346,7 +346,7 @@
 | | ... | ${node} | ${sub_if_name}
 | | ... | ${ipv4['address']} | ${ipv4['prefix-length']}
 
-| Honeycomb removes sub-interface ipv4 address
+| TC16: Honeycomb removes sub-interface ipv4 address
 | | [Documentation] | Check if Honeycomb can remove configured ipv4 addresses\
 | | ... | from the sub-interface.
 | | ...
@@ -364,7 +364,7 @@
 | | And sub-interface ipv4 address from VAT should be empty
 | | ... | ${node} | ${sub_if_name}
 
-| Honeycomb modifies existing sub-interface ipv4 address
+| TC17: Honeycomb modifies existing sub-interface ipv4 address
 | | [Documentation] | Check if Honeycomb can modify an ipv4 address already\
 | | ... | configured on the sub-interface.
 | | [Teardown] | Honeycomb removes all sub-interface ipv4 addresses
diff --git a/tests/func/honeycomb/010_interface_management.robot b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
similarity index 93%
rename from tests/func/honeycomb/010_interface_management.robot
rename to tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
index 5773b9bdfa..4ffac6d438 100644
--- a/tests/func/honeycomb/010_interface_management.robot
+++ b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
@@ -42,7 +42,7 @@
 | ... | Test suite uses the first interface of the first DUT node.
 
 *** Test Cases ***
-| Honeycomb configures and reads interface state
+| TC01: Honeycomb configures and reads interface state
 | | [Documentation] | Check if Honeycomb API can modify the admin state of\
 | | ... | VPP interfaces.
 | | Given Interface state from Honeycomb should be
@@ -57,7 +57,7 @@
 | | ... | ${node} | ${interface} | down
 | | And Interface state from VAT should be | ${node} | ${interface} | down
 
-| Honeycomb modifies interface IPv4 address with netmask
+| TC02: Honeycomb modifies interface IPv4 address with netmask
 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4\
 | | ... | with address and netmask provided.
 | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface}
@@ -69,7 +69,7 @@
 | | And IPv4 address from VAT should be
 | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_mask}
 
-| Honeycomb removes IPv4 address from interface
+| TC03: Honeycomb removes IPv4 address from interface
 | | [Documentation] | Check if Honeycomb API can remove configured ipv4\
 | | ... | addresses from interface.
 | | Given IPv4 address from Honeycomb should be
@@ -80,7 +80,7 @@
 | | Then IPv4 address from Honeycomb should be empty | ${node} | ${interface}
 | | And ipv4 address from VAT should be empty | ${node} | ${interface}
 
-| Honeycomb modifies interface IPv4 address with prefix
+| TC04: Honeycomb modifies interface IPv4 address with prefix
 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4\
 | | ... | with address and prefix provided.
 | | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node}
@@ -94,7 +94,7 @@
 | | And IPv4 address from VAT should be
 | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_mask}
 
-| Honeycomb modifies IPv4 neighbor table
+| TC05: Honeycomb modifies IPv4 neighbor table
 | | [Documentation] | Check if Honeycomb API can add and remove ARP entries.
 # Operational data and VAT dump not available (HONEYCOMB-111)
 | | [Tags] | EXPECTED_FAILING
@@ -105,7 +105,7 @@
 | | Then IPv4 neighbor from Honeycomb should be
 | | ... | ${node} | ${interface} | @{ipv4_neighbor}
 
-| Honeycomb modifies interface configuration - IPv6
+| TC06: Honeycomb modifies interface configuration - IPv6
 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv6.
 # Configuring IPv6 not implemented (HONEYCOMB-102)
 | | [Tags] | EXPECTED_FAILING
@@ -118,7 +118,7 @@
 
 # TODO: Honeycomb modifies IPv6 neighbor table
 
-| Honeycomb modifies interface configuration - MTU
+| TC07: Honeycomb modifies interface configuration - MTU
 | | [Documentation] | Check if Honeycomb API can configure interface\
 | | ... | MTU value.
 # Configuring MTU not implemented (HONEYCOMB-126)
diff --git a/tests/func/honeycomb/040_tap.robot b/tests/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot
similarity index 95%
rename from tests/func/honeycomb/040_tap.robot
rename to tests/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot
index cf45107ade..04f94b81c0 100644
--- a/tests/func/honeycomb/040_tap.robot
+++ b/tests/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot
@@ -34,7 +34,7 @@
 | ... | Test suite uses the first interface of the first DUT node.
 
 *** Test Cases ***
-| Honeycomb configures TAP interface
+| TC01: Honeycomb configures TAP interface
 | | [Documentation] | Check if Honeycomb API can configure a TAP interface.
 | | Given TAP configuration from Honeycomb should be empty
 | | ... | ${node} | ${tap_interface}
@@ -47,7 +47,7 @@
 | | And TAP configuration from VAT should be
 | | ... | ${node} | ${tap_interface} | ${tap_settings}
 
-| Honeycomb modifies existing TAP interface configuration
+| TC02: Honeycomb modifies existing TAP interface configuration
 | | [Documentation] | Check if Honeycomb API can re-configure and existing TAP\
 | | ... | interface with new settings.
 | | Given TAP configuration from Honeycomb should be
@@ -61,7 +61,7 @@
 | | And TAP configuration from VAT should be
 | | ... | ${node} | ${tap_interface} | ${tap_settings2}
 
-| Honeycomb removes TAP interface
+| TC03: Honeycomb removes TAP interface
 | | [Documentation] | Check if Honeycomb API can remove TAP interface.
 | | Given TAP configuration from Honeycomb should be
 | | ... | ${node} | ${tap_interface} | ${tap_settings2}
diff --git a/tests/func/honeycomb/050_interface_vhost_user.robot b/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot
similarity index 93%
rename from tests/func/honeycomb/050_interface_vhost_user.robot
rename to tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot
index 1310f2c7d6..f96187278e 100644
--- a/tests/func/honeycomb/050_interface_vhost_user.robot
+++ b/tests/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot
@@ -36,7 +36,7 @@
 | ...           | delete a vhost-user interface.
 
 *** Test Cases ***
-| Honycomb creates vhost-user interface - server
+| TC01: Honycomb creates vhost-user interface - server
 | | [Documentation] | Check if Honeycomb creates a vhost-user interface, role:\
 | | ... | server.
 | | ...
@@ -49,7 +49,7 @@
 | | And vhost-user configuration from VAT should be
 | | ... | ${node} | ${vhost_user_server}
 
-| Honycomb modifies vhost-user interface - server
+| TC02: Honycomb modifies vhost-user interface - server
 | | [Documentation] | Check if Honeycomb can modify properties of existing\
 | | ... | vhost-user interface, role: server.
 | | ...
@@ -74,7 +74,7 @@
 | | And vhost-user configuration from VAT should be
 | | ... | ${node} | ${vhost_user_server}
 
-| Honycomb deletes vhost-user interface - server
+| TC03: Honycomb deletes vhost-user interface - server
 | | [Documentation] | Check if Honeycomb can delete an existing vhost-user\
 | | ... | interface, role: server.
 | | ...
@@ -87,7 +87,7 @@
 | | And vhost-user configuration from VAT should be empty
 | | ... | ${node}
 
-| Honycomb creates vhost-user interface - client
+| TC04: Honycomb creates vhost-user interface - client
 | | [Documentation] | Check if Honeycomb creates a vhost-user interface, role:\
 | | ... | client.
 | | ...
@@ -100,7 +100,7 @@
 | | And vhost-user configuration from VAT should be
 | | ... | ${node} | ${vhost_user_client}
 
-| Honycomb modifies vhost-user interface - client
+| TC05: Honycomb modifies vhost-user interface - client
 | | [Documentation] | Check if Honeycomb can modify properties of existing\
 | | ... | vhost-user interface, role: client.
 | | ...
@@ -125,7 +125,7 @@
 | | And vhost-user configuration from VAT should be
 | | ... | ${node} | ${vhost_user_client}
 
-| Honycomb deletes vhost-user interface - client
+| TC06: Honycomb deletes vhost-user interface - client
 | | [Documentation] | Check if Honeycomb can delete an existing vhost-user\
 | | ... | interface, role: client.
 | | ...
@@ -138,7 +138,7 @@
 | | And vhost-user configuration from VAT should be empty
 | | ... | ${node}
 
-| Honeycomb does not set vhost-user configuration on another interface type
+| TC07: Honeycomb does not set vhost-user configuration on another interface type
 | | [Documentation] | Check if Honeycomb refuses to set vhost-user\
 | | ... | configuration for interface which is not v3po:vhost-user type.
 | | ...
@@ -149,7 +149,7 @@
 | | And vhost-user configuration from VAT should be empty
 | | ... | ${node}
 
-| Honeycomb does not set invalid vhost-user configuration
+| TC08: Honeycomb does not set invalid vhost-user configuration
 | | [Documentation] | Check if Honeycomb refuses to set invalid parameters to\
 | | ... | vhost-user interface.
 | | ...
diff --git a/tests/func/honeycomb/020_bridge_domain.robot b/tests/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot
similarity index 94%
rename from tests/func/honeycomb/020_bridge_domain.robot
rename to tests/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot
index 0854051033..3a32f02136 100644
--- a/tests/func/honeycomb/020_bridge_domain.robot
+++ b/tests/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot
@@ -38,7 +38,7 @@
 | ... | Test suite uses the first two interfaces on the first DUT node.
 
 *** Test Cases ***
-| Honeycomb sets up l2 bridge domain
+| TC01: Honeycomb sets up l2 bridge domain
 | | [Documentation] | Check if Honeycomb can create bridge domains on VPP node.
 | | When Honeycomb creates first l2 bridge domain
 | | ... | ${node} | ${bd1_name} | ${bd_settings}
@@ -47,7 +47,7 @@
 | | And Bridge domain configuration from VAT should be
 | | ... | ${node} | ${0} | ${bd_settings}
 
-| Honeycomb manages multiple bridge domains on node
+| TC02: Honeycomb manages multiple bridge domains on node
 | | [Documentation] | Check if Honeycomb can manage multiple bridge domains on\
 | | ... | a single node.
 | | Given Bridge domain configuration from Honeycomb should be
@@ -63,7 +63,7 @@
 | | And Bridge domain configuration from VAT should be
 | | ... | ${node} | ${1} | ${bd_settings}
 
-| Honeycomb removes bridge domains
+| TC03: Honeycomb removes bridge domains
 | | [Documentation] | Check if Honeycomb can remove bridge domains from a VPP\
 | | ... | node.
 | | Given Bridge domain configuration from Honeycomb should be
@@ -72,7 +72,7 @@
 | | Then Honeycomb should show no bridge domains | ${node}
 | | And VAT should show no bridge domains | ${node}
 
-| Honeycomb assigns interfaces to bridge domain
+| TC04: Honeycomb assigns interfaces to bridge domain
 | | [Documentation] | Check if Honeycomb can assign VPP interfaces to an\
 | | ... | existing bridge domain.
 | | Given Honeycomb creates first l2 bridge domain
@@ -84,7 +84,7 @@
 | | And VAT should show interfaces assigned to bridge domain
 | | ... | ${node} | ${0} | @{interfaces} | ${if_settings}
 
-| Honeycomb removes bridge domain with an interface assigned
+| TC05: Honeycomb removes bridge domain with an interface assigned
 | | [Documentation] | Check if Honeycomb can remove a bridge domain that has an\
 | | ... | interface assigned to it.
 # Bridge domain references not cleaned up on delete (HONEYCOMB-267)
diff --git a/tests/func/honeycomb/021_l2_fib.robot b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
similarity index 96%
rename from tests/func/honeycomb/021_l2_fib.robot
rename to tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
index 81b8260610..9a299df231 100644
--- a/tests/func/honeycomb/021_l2_fib.robot
+++ b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
@@ -36,7 +36,7 @@
 | ${interface2}= | ${node['interfaces']['port3']['name']}
 
 *** Test Cases ***
-| Honeycomb adds L2 FIB entry (forward)
+| TC01: Honeycomb adds L2 FIB entry (forward)
 | | [Documentation] | Honeycomb creates a bridge domain and assignes an \
 | | ... | interface to it. Then adds an L2 FIB entry (forward) to the bridge \
 | | ... | domain.
@@ -71,7 +71,7 @@
 | | And L2 FIB entry from VAT should be
 | | ... | ${node} | ${bd_index} | ${l2_fib_forward_vat}
 
-| Honeycomb adds L2 FIB entry (static, forward)
+| TC02: Honeycomb adds L2 FIB entry (static, forward)
 | | [Documentation] | Honeycomb adds an L2 FIB entry (static, forward) to the \
 | | ... | bridge domain.
 | | ...
@@ -91,7 +91,7 @@
 | | And L2 FIB entry from VAT should be
 | | ... | ${node} | ${bd_index} | ${l2_fib_static_forward_vat}
 
-| Honeycomb adds L2 FIB entry (static, filter)
+| TC03: Honeycomb adds L2 FIB entry (static, filter)
 | | [Documentation] | Honeycomb adds an L2 FIB entry (static, filter) to the \
 | | ... | bridge domain.
 | | ...
@@ -111,7 +111,7 @@
 | | And L2 FIB entry from VAT should be
 | | ... | ${node} | ${bd_index} | ${l2_fib_filter_vat}
 
-| Honeycomb adds and removes L2 FIB entry (forward)
+| TC04: Honeycomb adds and removes L2 FIB entry (forward)
 | | [Documentation] | Honeycomb adds an L2 FIB entry (forward) to the bridge \
 | | ... | domain and then Honeycomb removes it from the bridge domain.
 | | ...
@@ -137,7 +137,7 @@
 | | And L2 FIB Table from VAT should be empty
 | | ... | ${node} | ${bd_index}
 
-| Honeycomb adds more than one L2 FIB entry
+| TC05: Honeycomb adds more than one L2 FIB entry
 | | [Documentation] | Honeycomb adds three L2 FIB entries to the bridge domain.
 | | ...
 | | [Teardown] | Honeycomb removes all L2 FIB entries
@@ -168,7 +168,7 @@
 | | And L2 FIB entry from VAT should be
 | | ... | ${node} | ${bd_index} | ${l2_fib_filter_vat}
 
-| Honeycomb fails to set wrong L2 FIB entry
+| TC06: Honeycomb fails to set wrong L2 FIB entry
 | | [Documentation] | Honeycomb tries to add an L2 FIB entry with wrong \
 | | ... | parameters to the bridge domain. It must fail.
 | | ...
@@ -200,7 +200,7 @@
 | | And L2 FIB Table from VAT should be empty
 | | ... | ${node} | ${bd_index}
 
-| Honeycomb fails to modify existing L2 FIB entry
+| TC07: Honeycomb fails to modify existing L2 FIB entry
 | | [Documentation] | Honeycomb tries to modify an existing L2 FIB entry. It \
 | | ... | must fail.
 | | ...
diff --git a/tests/func/honeycomb/100_lisp.robot b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
similarity index 100%
rename from tests/func/honeycomb/100_lisp.robot
rename to tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
diff --git a/tests/func/honeycomb/110_nsh_sfc.robot b/tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
similarity index 100%
rename from tests/func/honeycomb/110_nsh_sfc.robot
rename to tests/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
diff --git a/tests/func/honeycomb/090_provider_backbone_bridge.robot b/tests/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot
similarity index 91%
rename from tests/func/honeycomb/090_provider_backbone_bridge.robot
rename to tests/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot
index 16791e236b..99396028f6 100644
--- a/tests/func/honeycomb/090_provider_backbone_bridge.robot
+++ b/tests/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot
@@ -44,21 +44,21 @@
 | | Honeycomb Removes PBB sub interface
 | | ... | ${node} | ${super_if}
 
-| TC05: Honeycomb fails to set wrong destination-address for new PBB sub-interface
+| TC04: Honeycomb fails to set wrong destination-address for new PBB sub-interface
 | | [Documentation] | Honeycomb fails to create a new PBB sub-interface with\
 | | ... | wrong value of parameter destination-address, type yang:mac-address.
 | | ...
 | | Honeycomb fails to create PBB sub interface | ${node} | ${super_if}
 | | ... | ${cfg_pbb_sub_if_wrong_dst_addr}
 
-| TC06: Honeycomb fails to set wrong source-address for new PBB sub-interface
+| TC05: Honeycomb fails to set wrong source-address for new PBB sub-interface
 | | [Documentation] | Honeycomb fails to create a new PBB sub-interface with\
 | | ... | wrong value of parameter source-address, type yang:mac-address.
 | | ...
 | | Honeycomb fails to create PBB sub interface | ${node} | ${super_if}
 | | ... | ${cfg_pbb_sub_if_wrong_src_addr}
 
-| TC07: Honeycomb fails to set wrong b-vlan-tag-vlan-id for new PBB sub-interface
+| TC06: Honeycomb fails to set wrong b-vlan-tag-vlan-id for new PBB sub-interface
 | | [Documentation] | Honeycomb fails to create a new PBB sub-interface with\
 | | ... | wrong value of parameter b-vlan-tag-vlan-id, type uint16, 12 bit\
 | | ... | range, range "1..4095".
@@ -66,7 +66,7 @@
 | | Honeycomb fails to create PBB sub interface | ${node} | ${super_if}
 | | ... | ${cfg_pbb_sub_if_wrong_vlan_tag}
 
-| TC08: Honeycomb fails to set wrong i-tag-isid for new PBB sub-interface
+| TC07: Honeycomb fails to set wrong i-tag-isid for new PBB sub-interface
 | | [Documentation] | Honeycomb fails to create a new PBB sub-interface with\
 | | ... | wrong value of parameter i-tag-isid, type uint32, 24 bit range,\
 | | ... | range "1..16777215".
@@ -74,7 +74,7 @@
 | | Honeycomb fails to create PBB sub interface | ${node} | ${super_if}
 | | ... | ${cfg_pbb_sub_if_wrong_i_tag}
 
-| TC07: Honeycomb fails to create new PBB sub-interface without vlan tag
+| TC08: Honeycomb fails to create new PBB sub-interface without vlan tag
 | | [Documentation] | Honeycomb fails to create a new PBB sub-interface without\
 | | ... | parameter b-vlan-tag-vlan-id.
 | | ...
diff --git a/tests/func/honeycomb/130_nat.robot b/tests/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot
similarity index 100%
rename from tests/func/honeycomb/130_nat.robot
rename to tests/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot
diff --git a/tests/func/honeycomb/120_port_mirroring.robot b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
similarity index 94%
rename from tests/func/honeycomb/120_port_mirroring.robot
rename to tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
index 48fe5ae08a..ff72f956af 100644
--- a/tests/func/honeycomb/120_port_mirroring.robot
+++ b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
@@ -32,7 +32,7 @@
 
 *** Test Cases ***
 # TODO: Add verification once operational data is available (HONEYCOMB-306)
-| Honeycomb can configure SPAN on an interface
+| TC01: Honeycomb can configure SPAN on an interface
 | | [Documentation] | Honeycomb configures SPAN on interface and verifies/
 | | ... | against VPP SPAN dump.
 | | Given SPAN configuration from VAT should not exist
@@ -42,7 +42,7 @@
 | | Then Interface SPAN configuration from VAT should be
 | | ... | ${node} | ${interface1} | ${interface2}
 
-| Honeycomb can disable SPAN on interface
+| TC02: Honeycomb can disable SPAN on interface
 | | [Documentation] | Honeycomb removes existing SPAN configuration\
 | | ... | on interface and verifies against VPP SPAN dump.
 | | Given Interface SPAN configuration from VAT should be
@@ -52,7 +52,7 @@
 | | Then SPAN configuration from VAT should not exist
 | | ... | ${node}
 
-| Honeycomb can configure SPAN on one interface to mirror two interfaces
+| TC03: Honeycomb can configure SPAN on one interface to mirror two interfaces
 | | [Documentation] | Honeycomb configures SPAN on interface, mirroring\
 | | ... | two interfaces at the same time. Then verifies against VPP SPAN dump.
 | | [Teardown] | Honeycomb removes interface SPAN configuration
diff --git a/tests/func/honeycomb/030_vxlan.robot b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
similarity index 94%
rename from tests/func/honeycomb/030_vxlan.robot
rename to tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
index a44628a593..55131e713c 100644
--- a/tests/func/honeycomb/030_vxlan.robot
+++ b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot
@@ -40,7 +40,7 @@
 | ... | Test suite uses the first interface of the first DUT node.
 
 *** Test Cases ***
-| Honeycomb configures VxLAN tunnel
+| TC01: Honeycomb configures VxLAN tunnel
 | | [Documentation] | Check if Honeycomb API can configure VxLAN settings.
 | | Given VxLAN configuration from Honeycomb should be empty
 | | ... | ${node} | ${vx_interface}
@@ -55,7 +55,7 @@
 | | ... | ${node} | ${vx_interface}
 | | Set Suite Variable | ${vxlan_index}
 
-| Honeycomb disables VxLAN tunnel
+| TC02: Honeycomb disables VxLAN tunnel
 | | [Documentation] | Check if Honeycomb API can reset VxLAN configuration.
 | | Given VxLAN configuration from Honeycomb should be
 | | ... | ${node} | ${vx_interface} | ${vxlan_settings}
@@ -70,7 +70,7 @@
 | | ... | ${node} | ${vxlan_index}
 | | And VxLAN configuration from VAT should be empty | ${node}
 
-| Honeycomb can configure VXLAN tunnel after one has been disabled
+| TC03: Honeycomb can configure VXLAN tunnel after one has been disabled
 | | [Documentation] | Check if Honeycomb API can configure VxLAN settings again\
 | | ... | after previous settings have been removed.
 | | [Teardown] | Honeycomb removes VxLAN tunnel settings
@@ -89,7 +89,7 @@
 | | And VxLAN configuration from VAT should be
 | | ... | ${node} | ${vxlan_settings2}
 
-| Honeycomb does not set VxLAN configuration on another interface type
+| TC04: Honeycomb does not set VxLAN configuration on another interface type
 | | [Documentation] | Check if Honeycomb API prevents setting VxLAN\
 | | ... | on incorrect interface.
 | | Given VxLAN configuration from Honeycomb should be empty
@@ -102,7 +102,7 @@
 | | And VxLAN configuration from VAT should be empty
 | | ... | ${node}
 
-| Honeycomb does not set invalid VxLAN configuration
+| TC05: Honeycomb does not set invalid VxLAN configuration
 | | [Documentation] | Check if Honeycomb API prevents setting incorrect VxLAN\
 | | ... | settings.
 | | Given VxLAN configuration from Honeycomb should be empty
@@ -113,7 +113,7 @@
 | | Then VxLAN configuration from Honeycomb should be empty
 | | ... | ${node} | ${vx_interface}
 
-| Honeycomb configures VxLAN tunnel with ipv6
+| TC06: Honeycomb configures VxLAN tunnel with ipv6
 | | [Documentation] | Check if Honeycomb API can configure VxLAN with\
 | | ... | ipv6 settings.
 | | [Teardown] | Honeycomb removes VxLAN tunnel settings
diff --git a/tests/func/honeycomb/031_vxlan_gpe.robot b/tests/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
similarity index 94%
rename from tests/func/honeycomb/031_vxlan_gpe.robot
rename to tests/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
index 9c6134b3cb..bb95b20f04 100644
--- a/tests/func/honeycomb/031_vxlan_gpe.robot
+++ b/tests/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot
@@ -44,7 +44,7 @@
 | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
 
 *** Test Cases ***
-| Honeycomb creates VxLAN GPE tunnel
+| TC01: Honeycomb creates VxLAN GPE tunnel
 | | [Documentation] | Check if Honeycomb API can configure a VxLAN GPE tunnel.
 | | ...
 | | Given interface configuration from Honeycomb should be empty
@@ -62,7 +62,7 @@
 | | And VxLAN GPE Interface indices from Honeycomb and VAT should correspond
 | | ... | ${node} | ${vxlan_gpe_if1}
 
-| Honeycomb removes VxLAN GPE tunnel
+| TC02: Honeycomb removes VxLAN GPE tunnel
 | | [Documentation] | Check if Honeycomb API can remove VxLAN GPE tunnel.
 | | ...
 | | Given VxLAN GPE configuration from Honeycomb should be
@@ -77,7 +77,7 @@
 | | And VxLAN GPE configuration from VAT should be empty
 | | ... | ${node}
 
-| Honeycomb sets wrong interface type while creating VxLAN GPE tunnel
+| TC03: Honeycomb sets wrong interface type while creating VxLAN GPE tunnel
 | | [Documentation] | Check if Honeycomb refuses to create a VxLAN GPE tunnel\
 | | ... | with a wrong interface type set.
 | | ...
@@ -93,7 +93,7 @@
 | | And interface configuration from VAT should be empty
 | | ... | ${node} | ${vxlan_gpe_if2}
 
-| Honeycomb sets wrong protocol while creating VxLAN GPE tunnel
+| TC04: Honeycomb sets wrong protocol while creating VxLAN GPE tunnel
 | | [Documentation] | Check if Honeycomb refuses to create a VxLAN GPE tunnel\
 | | ... | with a wrong next-protocol set.
 | | ...
@@ -110,7 +110,7 @@
 | | And interface configuration from VAT should be empty
 | | ... | ${node} | ${vxlan_gpe_if3}
 
-| Honeycomb sets VxLAN GPE tunnel on existing interface with wrong type
+| TC05: Honeycomb sets VxLAN GPE tunnel on existing interface with wrong type
 | | [Documentation] | Check if Honeycomb refuses to create a VxLAN GPE tunnel\
 | | ... | on existing interface with wrong type.
 | | ...
@@ -123,7 +123,7 @@
 | | Then VxLAN GPE configuration from VAT should be empty
 | | ... | ${node}
 
-| Honeycomb creates VxLAN GPE tunnel with ipv6
+| TC06: Honeycomb creates VxLAN GPE tunnel with ipv6
 | | [Documentation] | Check if Honeycomb API can configure a VxLAN GPE tunnel\
 | | ... | with IPv6 addresses.
 | | ...
@@ -143,7 +143,7 @@
 | | And VxLAN GPE Interface indices from Honeycomb and VAT should correspond
 | | ... | ${node} | ${vxlan_gpe_if5}
 
-| Honeycomb creates a second VxLAN GPE tunnel with ipv6
+| TC07: Honeycomb creates a second VxLAN GPE tunnel with ipv6
 | | [Documentation] | Check if Honeycomb API can configure another VxLAN\
 | | ... | GPE tunnel with IPv6 addresses.
 | | ...
diff --git a/tests/func/honeycomb/071_notification.robot b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot
similarity index 95%
rename from tests/func/honeycomb/071_notification.robot
rename to tests/func/honeycomb/mgmt-notif-apihcnc-func.robot
index 41d04913a6..2b6802c205 100644
--- a/tests/func/honeycomb/071_notification.robot
+++ b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot
@@ -35,7 +35,7 @@
 | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
 
 *** Test Cases ***
-| Honeycomb sends notification on interface state change
+| TC01: Honeycomb sends notification on interface state change
 | | [Documentation] | Check if Honeycomb sends a state-changed notification\
 | | ... | when the state of an interface is changed.
 | | Given Interface state from Honeycomb should be
@@ -47,7 +47,7 @@
 | | When Honeycomb sets interface state | ${node} | ${interface} | down
 | | And Honeycomb should send interface state notification | ${interface} | down
 
-| Honeycomb sends notification on interface deletion
+| TC02: Honeycomb sends notification on interface deletion
 | | [Documentation] | Check if Honeycomb sends an interface-deleted notification
 | | ... | when an interface is deleted.
 | | Given TAP configuration from Honeycomb should be
diff --git a/tests/func/honeycomb/900_persistence.robot b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
similarity index 91%
rename from tests/func/honeycomb/900_persistence.robot
rename to tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
index e0c8ea1b46..84dad452b5 100644
--- a/tests/func/honeycomb/900_persistence.robot
+++ b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot
@@ -24,7 +24,7 @@
 | Documentation | *Honeycomb configuration persistence test suite.*
 
 *** Test Cases ***
-| Honeycomb persists configuration through restart of both Honeycomb and VPP
+| TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP
 | | [Documentation] | Checks if Honeycomb maintains configuration after both\
 | | ... | Honeycomb and VPP are restarted.
 # Vxlan tunnel name is not properly restored (HONEYCOMB-301)
@@ -35,7 +35,7 @@
 | | Then Honeycomb and VPP should verify every setting | ${node} | ${interface}
 | | And Honeycomb should show no rogue interfaces | ${node}
 
-| Honeycomb persists configuration through restart of Honeycomb
+| TC02: Honeycomb persists configuration through restart of Honeycomb
 | | [Documentation] | Checks if Honeycomb maintains configuration after it\
 | | ... | is restarted.
 # Vxlan tunnel name is not properly restored (HONEYCOMB-301)
@@ -45,7 +45,7 @@
 | | Then Honeycomb and VPP should verify every setting | ${node} | ${interface}
 | | And Honeycomb should show no rogue interfaces | ${node}
 
-| Honeycomb persists configuration through restart of VPP
+| TC03: Honeycomb persists configuration through restart of VPP
 | | [Documentation] | Checks if Honeycomb updates VPP settings after VPP is\
 | | ... | restarted.
 # Vxlan tunnel name is not properly restored (HONEYCOMB-301)
@@ -55,7 +55,7 @@
 | | Then Honeycomb and VPP should verify every setting | ${node} | ${interface}
 | | And Honeycomb should show no rogue interfaces | ${node}
 
-| Honeycomb reverts to defaults if persistence files are invalid
+| TC04: Honeycomb reverts to defaults if persistence files are invalid
 | | [Documentation] | Checks if Honeycomb reverts to default configuration when\
 | | ... | persistence files are damaged or invalid.
 | | [Teardown] | Run keyword if test failed