From 70cbaaee0e6210682ce6d278ea645b8bea153b67 Mon Sep 17 00:00:00 2001 From: Matej Klotton Date: Fri, 22 Jul 2016 09:34:25 +0200 Subject: [PATCH] CSIT-220: Rename directories in tests directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - Move performance directory one level up and rename it to “perf” - Rename “suites” directory to “func” - Create __init__.py in “perf” directory - Rename fds_related_tests to fds Change-Id: I59f06afe1c5b95dd8a48417b8fbfd1fca8797097 Signed-off-by: Matej Klotton --- bootstrap-verify-perf.sh | 18 ++++++++++-------- bootstrap-vpp-verify-semiweekly.sh | 2 ++ bootstrap-vpp-verify-weekly.sh | 1 + bootstrap.sh | 3 ++- tests/{suites => func}/__init__.robot | 0 .../bridge_domain/bridge_domain_untagged.robot | 0 .../cop/cop_whitelist_blacklist.robot | 0 .../cop/cop_whitelist_blacklist_IPv6.robot | 0 tests/{suites => func}/dhcp/dhcp_client.robot | 0 .../fds}/provider_network.robot | 0 .../fds}/tenant_network.robot | 0 tests/{suites => func}/gre/gre_encapsulation.robot | 0 .../honeycomb/010_interface_management.robot | 0 .../honeycomb/020_bridge_domain.robot | 0 tests/{suites => func}/honeycomb/021_l2_fib.robot | 0 tests/{suites => func}/honeycomb/030_vxlan.robot | 0 tests/{suites => func}/honeycomb/031_vxlan_gpe.robot | 0 tests/{suites => func}/honeycomb/040_tap.robot | 0 .../honeycomb/050_interface_vhost_user.robot | 0 .../honeycomb/060_sub_interface.robot | 0 tests/{suites => func}/honeycomb/070_netconf.robot | 0 .../{suites => func}/honeycomb/071_notification.robot | 0 .../honeycomb/080_access_control_lists.robot | 0 .../{suites => func}/honeycomb/900_persistence.robot | 0 tests/{suites => func}/honeycomb/__init__.robot | 0 tests/{suites => func}/iacl/ipv4_iacl_untagged.robot | 0 tests/{suites => func}/iacl/ipv6_iacl_untagged.robot | 0 tests/{suites => func}/iacl/l2_iacl_untagged.robot | 0 tests/{suites => func}/ipv4/ipv4_arp_untagged.robot | 0 .../ipv4/ipv4_proxy_arp_untagged.robot | 0 tests/{suites => func}/ipv4/ipv4_untagged.robot | 0 tests/{suites => func}/ipv6/ipv6_ra.robot | 0 tests/{suites => func}/ipv6/ipv6_untagged.robot | 0 .../l2_xconnect/l2_xconnect_untagged.robot | 0 tests/{suites => func}/lisp/lisp_api_untagged.robot | 0 .../lisp/lisp_dataplane_untagged.robot | 0 tests/{suites => func}/rpf/ipv4_rpf_untagged.robot | 0 .../softwire/lightweight_4over6.robot | 0 tests/{suites => func}/tap/tap_interface.robot | 0 tests/{suites => func}/vlan/qinq_l2_xconnect.robot | 0 .../vlan_tag_translate_l2_bridge_domain_ipv4.robot | 0 .../vlan_tag_translate_l2_bridge_domain_ipv6.robot | 0 .../vlan/vlan_tag_translate_l2_xconnect_ipv4.robot | 0 .../vlan/vlan_tag_translate_l2_xconnect_ipv6.robot | 0 tests/{suites => func}/vrf/vrf_tests.robot | 0 tests/{suites => func}/vxlan/vxlan_bd_dot1q.robot | 0 tests/{suites => func}/vxlan/vxlan_bd_untagged.robot | 0 .../vxlan/vxlan_xconnect_untagged.robot | 0 .../Long_Bridge_Domain_Intel-X520-DA2.robot | 0 .../Long_IPv4_Cop_Intel-X520-DA2.robot | 0 .../Long_IPv4_Intel-X520-DA2.robot | 0 .../Long_IPv4_iAcl_Intel-X520-DA2.robot | 0 .../Long_IPv6_Cop_Intel-X520-DA2.robot | 0 .../Long_IPv6_Intel-X520-DA2.robot | 0 .../Long_Xconnect_Dot1ad_Intel-X520-DA2.robot | 0 .../Long_Xconnect_Dot1q_Intel-X520-DA2.robot | 0 .../Long_Xconnect_Intel-X520-DA2.robot | 0 .../Short_Bridge_Domain_Intel-X520-DA2.robot | 0 .../Short_IPv4_Cop_Intel-X520-DA2.robot | 0 .../Short_IPv4_Intel-X520-DA2.robot | 0 .../Short_IPv4_iAcl_Intel-X520-DA2.robot | 0 .../Short_IPv6_Cop_Intel-X520-DA2.robot | 0 .../Short_IPv6_Intel-X520-DA2.robot | 0 .../Short_Xconnect_Dot1ad_Intel-X520-DA2.robot | 0 .../Short_Xconnect_Dot1q_Intel-X520-DA2.robot | 0 .../Short_Xconnect_Intel-X520-DA2.robot | 0 tests/perf/__init__.robot | 19 +++++++++++++++++++ 67 files changed, 34 insertions(+), 9 deletions(-) rename tests/{suites => func}/__init__.robot (100%) rename tests/{suites => func}/bridge_domain/bridge_domain_untagged.robot (100%) rename tests/{suites => func}/cop/cop_whitelist_blacklist.robot (100%) rename tests/{suites => func}/cop/cop_whitelist_blacklist_IPv6.robot (100%) rename tests/{suites => func}/dhcp/dhcp_client.robot (100%) rename tests/{suites/fds_related_tests => func/fds}/provider_network.robot (100%) rename tests/{suites/fds_related_tests => func/fds}/tenant_network.robot (100%) rename tests/{suites => func}/gre/gre_encapsulation.robot (100%) rename tests/{suites => func}/honeycomb/010_interface_management.robot (100%) rename tests/{suites => func}/honeycomb/020_bridge_domain.robot (100%) rename tests/{suites => func}/honeycomb/021_l2_fib.robot (100%) rename tests/{suites => func}/honeycomb/030_vxlan.robot (100%) rename tests/{suites => func}/honeycomb/031_vxlan_gpe.robot (100%) rename tests/{suites => func}/honeycomb/040_tap.robot (100%) rename tests/{suites => func}/honeycomb/050_interface_vhost_user.robot (100%) rename tests/{suites => func}/honeycomb/060_sub_interface.robot (100%) rename tests/{suites => func}/honeycomb/070_netconf.robot (100%) rename tests/{suites => func}/honeycomb/071_notification.robot (100%) rename tests/{suites => func}/honeycomb/080_access_control_lists.robot (100%) rename tests/{suites => func}/honeycomb/900_persistence.robot (100%) rename tests/{suites => func}/honeycomb/__init__.robot (100%) rename tests/{suites => func}/iacl/ipv4_iacl_untagged.robot (100%) rename tests/{suites => func}/iacl/ipv6_iacl_untagged.robot (100%) rename tests/{suites => func}/iacl/l2_iacl_untagged.robot (100%) rename tests/{suites => func}/ipv4/ipv4_arp_untagged.robot (100%) rename tests/{suites => func}/ipv4/ipv4_proxy_arp_untagged.robot (100%) rename tests/{suites => func}/ipv4/ipv4_untagged.robot (100%) rename tests/{suites => func}/ipv6/ipv6_ra.robot (100%) rename tests/{suites => func}/ipv6/ipv6_untagged.robot (100%) rename tests/{suites => func}/l2_xconnect/l2_xconnect_untagged.robot (100%) rename tests/{suites => func}/lisp/lisp_api_untagged.robot (100%) rename tests/{suites => func}/lisp/lisp_dataplane_untagged.robot (100%) rename tests/{suites => func}/rpf/ipv4_rpf_untagged.robot (100%) rename tests/{suites => func}/softwire/lightweight_4over6.robot (100%) rename tests/{suites => func}/tap/tap_interface.robot (100%) rename tests/{suites => func}/vlan/qinq_l2_xconnect.robot (100%) rename tests/{suites => func}/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot (100%) rename tests/{suites => func}/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot (100%) rename tests/{suites => func}/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot (100%) rename tests/{suites => func}/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot (100%) rename tests/{suites => func}/vrf/vrf_tests.robot (100%) rename tests/{suites => func}/vxlan/vxlan_bd_dot1q.robot (100%) rename tests/{suites => func}/vxlan/vxlan_bd_untagged.robot (100%) rename tests/{suites => func}/vxlan/vxlan_xconnect_untagged.robot (100%) rename tests/{suites/performance => perf}/Long_Bridge_Domain_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_IPv4_Cop_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_IPv4_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_IPv4_iAcl_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_IPv6_Cop_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_IPv6_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_Xconnect_Dot1q_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Long_Xconnect_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_Bridge_Domain_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_IPv4_Cop_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_IPv4_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_IPv4_iAcl_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_IPv6_Cop_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_IPv6_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_Xconnect_Dot1q_Intel-X520-DA2.robot (100%) rename tests/{suites/performance => perf}/Short_Xconnect_Intel-X520-DA2.robot (100%) create mode 100644 tests/perf/__init__.robot diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index b891bff646..e58548e91a 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -118,6 +118,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ -i perftest_long \ tests/ RETURN_STATUS=$(echo $?) @@ -126,6 +127,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + -s "tests.perf" \ -i perftest_short \ tests/ RETURN_STATUS=$(echo $?) @@ -134,7 +136,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "performance.Long_Bridge_Domain*" \ + -s "tests.perf.Long_Bridge_Domain*" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -142,7 +144,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "performance.Long_IPv4*" \ + -s "tests.perf.Long_IPv4*" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -150,7 +152,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "performance.Long_IPv6*" \ + -s "tests.perf.Long_IPv6*" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -158,7 +160,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "performance.Long_Xconnect*" \ + -s "tests.perf.Long_Xconnect*" \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -166,14 +168,14 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "performance.Long_Xconnect_Dot1q*" \ + -s "tests.perf.Long_Xconnect_Dot1q*" \ RETURN_STATUS=$(echo $?) ;; PERFTEST_NDR ) pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s performance -i NDR \ + -s "tests.perf" -i NDR \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -181,7 +183,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s performance -i PDR \ + -s "tests.perf" -i PDR \ tests/ RETURN_STATUS=$(echo $?) ;; @@ -190,7 +192,7 @@ case "$TEST_TAG" in pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s performance \ + -s "tests.perf" \ tests/ RETURN_STATUS=$(echo $?) esac diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh index 10f0f9007a..4e8daa58c2 100644 --- a/bootstrap-vpp-verify-semiweekly.sh +++ b/bootstrap-vpp-verify-semiweekly.sh @@ -247,6 +247,7 @@ do pybot -L TRACE \ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology_VIRL.yaml \ + --suite "tests.func" \ --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ @@ -340,6 +341,7 @@ echo Performance tests on HW system pybot ${PYBOT_ARGS} \ -L TRACE \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ + --suite "tests.perf" \ --include perftest_long \ --output log_perf_test_set \ tests/ diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index 3a67475f42..b4a3e8f034 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -202,6 +202,7 @@ do echo ${test_set}. test loop PYTHONPATH=`pwd` pybot -L TRACE \ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + --suite "tests.func" \ --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ diff --git a/bootstrap.sh b/bootstrap.sh index 5d5a7aea26..1eb0716654 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -201,8 +201,9 @@ if [ "$?" -ne "0" ]; then echo "However, the tests will start." fi -PYTHONPATH=`pwd` pybot -L TRACE -W 150\ +PYTHONPATH=`pwd` pybot -L TRACE -W 150 \ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ + --suite "tests.func" \ --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ diff --git a/tests/suites/__init__.robot b/tests/func/__init__.robot similarity index 100% rename from tests/suites/__init__.robot rename to tests/func/__init__.robot diff --git a/tests/suites/bridge_domain/bridge_domain_untagged.robot b/tests/func/bridge_domain/bridge_domain_untagged.robot similarity index 100% rename from tests/suites/bridge_domain/bridge_domain_untagged.robot rename to tests/func/bridge_domain/bridge_domain_untagged.robot diff --git a/tests/suites/cop/cop_whitelist_blacklist.robot b/tests/func/cop/cop_whitelist_blacklist.robot similarity index 100% rename from tests/suites/cop/cop_whitelist_blacklist.robot rename to tests/func/cop/cop_whitelist_blacklist.robot diff --git a/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot b/tests/func/cop/cop_whitelist_blacklist_IPv6.robot similarity index 100% rename from tests/suites/cop/cop_whitelist_blacklist_IPv6.robot rename to tests/func/cop/cop_whitelist_blacklist_IPv6.robot diff --git a/tests/suites/dhcp/dhcp_client.robot b/tests/func/dhcp/dhcp_client.robot similarity index 100% rename from tests/suites/dhcp/dhcp_client.robot rename to tests/func/dhcp/dhcp_client.robot diff --git a/tests/suites/fds_related_tests/provider_network.robot b/tests/func/fds/provider_network.robot similarity index 100% rename from tests/suites/fds_related_tests/provider_network.robot rename to tests/func/fds/provider_network.robot diff --git a/tests/suites/fds_related_tests/tenant_network.robot b/tests/func/fds/tenant_network.robot similarity index 100% rename from tests/suites/fds_related_tests/tenant_network.robot rename to tests/func/fds/tenant_network.robot diff --git a/tests/suites/gre/gre_encapsulation.robot b/tests/func/gre/gre_encapsulation.robot similarity index 100% rename from tests/suites/gre/gre_encapsulation.robot rename to tests/func/gre/gre_encapsulation.robot diff --git a/tests/suites/honeycomb/010_interface_management.robot b/tests/func/honeycomb/010_interface_management.robot similarity index 100% rename from tests/suites/honeycomb/010_interface_management.robot rename to tests/func/honeycomb/010_interface_management.robot diff --git a/tests/suites/honeycomb/020_bridge_domain.robot b/tests/func/honeycomb/020_bridge_domain.robot similarity index 100% rename from tests/suites/honeycomb/020_bridge_domain.robot rename to tests/func/honeycomb/020_bridge_domain.robot diff --git a/tests/suites/honeycomb/021_l2_fib.robot b/tests/func/honeycomb/021_l2_fib.robot similarity index 100% rename from tests/suites/honeycomb/021_l2_fib.robot rename to tests/func/honeycomb/021_l2_fib.robot diff --git a/tests/suites/honeycomb/030_vxlan.robot b/tests/func/honeycomb/030_vxlan.robot similarity index 100% rename from tests/suites/honeycomb/030_vxlan.robot rename to tests/func/honeycomb/030_vxlan.robot diff --git a/tests/suites/honeycomb/031_vxlan_gpe.robot b/tests/func/honeycomb/031_vxlan_gpe.robot similarity index 100% rename from tests/suites/honeycomb/031_vxlan_gpe.robot rename to tests/func/honeycomb/031_vxlan_gpe.robot diff --git a/tests/suites/honeycomb/040_tap.robot b/tests/func/honeycomb/040_tap.robot similarity index 100% rename from tests/suites/honeycomb/040_tap.robot rename to tests/func/honeycomb/040_tap.robot diff --git a/tests/suites/honeycomb/050_interface_vhost_user.robot b/tests/func/honeycomb/050_interface_vhost_user.robot similarity index 100% rename from tests/suites/honeycomb/050_interface_vhost_user.robot rename to tests/func/honeycomb/050_interface_vhost_user.robot diff --git a/tests/suites/honeycomb/060_sub_interface.robot b/tests/func/honeycomb/060_sub_interface.robot similarity index 100% rename from tests/suites/honeycomb/060_sub_interface.robot rename to tests/func/honeycomb/060_sub_interface.robot diff --git a/tests/suites/honeycomb/070_netconf.robot b/tests/func/honeycomb/070_netconf.robot similarity index 100% rename from tests/suites/honeycomb/070_netconf.robot rename to tests/func/honeycomb/070_netconf.robot diff --git a/tests/suites/honeycomb/071_notification.robot b/tests/func/honeycomb/071_notification.robot similarity index 100% rename from tests/suites/honeycomb/071_notification.robot rename to tests/func/honeycomb/071_notification.robot diff --git a/tests/suites/honeycomb/080_access_control_lists.robot b/tests/func/honeycomb/080_access_control_lists.robot similarity index 100% rename from tests/suites/honeycomb/080_access_control_lists.robot rename to tests/func/honeycomb/080_access_control_lists.robot diff --git a/tests/suites/honeycomb/900_persistence.robot b/tests/func/honeycomb/900_persistence.robot similarity index 100% rename from tests/suites/honeycomb/900_persistence.robot rename to tests/func/honeycomb/900_persistence.robot diff --git a/tests/suites/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot similarity index 100% rename from tests/suites/honeycomb/__init__.robot rename to tests/func/honeycomb/__init__.robot diff --git a/tests/suites/iacl/ipv4_iacl_untagged.robot b/tests/func/iacl/ipv4_iacl_untagged.robot similarity index 100% rename from tests/suites/iacl/ipv4_iacl_untagged.robot rename to tests/func/iacl/ipv4_iacl_untagged.robot diff --git a/tests/suites/iacl/ipv6_iacl_untagged.robot b/tests/func/iacl/ipv6_iacl_untagged.robot similarity index 100% rename from tests/suites/iacl/ipv6_iacl_untagged.robot rename to tests/func/iacl/ipv6_iacl_untagged.robot diff --git a/tests/suites/iacl/l2_iacl_untagged.robot b/tests/func/iacl/l2_iacl_untagged.robot similarity index 100% rename from tests/suites/iacl/l2_iacl_untagged.robot rename to tests/func/iacl/l2_iacl_untagged.robot diff --git a/tests/suites/ipv4/ipv4_arp_untagged.robot b/tests/func/ipv4/ipv4_arp_untagged.robot similarity index 100% rename from tests/suites/ipv4/ipv4_arp_untagged.robot rename to tests/func/ipv4/ipv4_arp_untagged.robot diff --git a/tests/suites/ipv4/ipv4_proxy_arp_untagged.robot b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot similarity index 100% rename from tests/suites/ipv4/ipv4_proxy_arp_untagged.robot rename to tests/func/ipv4/ipv4_proxy_arp_untagged.robot diff --git a/tests/suites/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot similarity index 100% rename from tests/suites/ipv4/ipv4_untagged.robot rename to tests/func/ipv4/ipv4_untagged.robot diff --git a/tests/suites/ipv6/ipv6_ra.robot b/tests/func/ipv6/ipv6_ra.robot similarity index 100% rename from tests/suites/ipv6/ipv6_ra.robot rename to tests/func/ipv6/ipv6_ra.robot diff --git a/tests/suites/ipv6/ipv6_untagged.robot b/tests/func/ipv6/ipv6_untagged.robot similarity index 100% rename from tests/suites/ipv6/ipv6_untagged.robot rename to tests/func/ipv6/ipv6_untagged.robot diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/func/l2_xconnect/l2_xconnect_untagged.robot similarity index 100% rename from tests/suites/l2_xconnect/l2_xconnect_untagged.robot rename to tests/func/l2_xconnect/l2_xconnect_untagged.robot diff --git a/tests/suites/lisp/lisp_api_untagged.robot b/tests/func/lisp/lisp_api_untagged.robot similarity index 100% rename from tests/suites/lisp/lisp_api_untagged.robot rename to tests/func/lisp/lisp_api_untagged.robot diff --git a/tests/suites/lisp/lisp_dataplane_untagged.robot b/tests/func/lisp/lisp_dataplane_untagged.robot similarity index 100% rename from tests/suites/lisp/lisp_dataplane_untagged.robot rename to tests/func/lisp/lisp_dataplane_untagged.robot diff --git a/tests/suites/rpf/ipv4_rpf_untagged.robot b/tests/func/rpf/ipv4_rpf_untagged.robot similarity index 100% rename from tests/suites/rpf/ipv4_rpf_untagged.robot rename to tests/func/rpf/ipv4_rpf_untagged.robot diff --git a/tests/suites/softwire/lightweight_4over6.robot b/tests/func/softwire/lightweight_4over6.robot similarity index 100% rename from tests/suites/softwire/lightweight_4over6.robot rename to tests/func/softwire/lightweight_4over6.robot diff --git a/tests/suites/tap/tap_interface.robot b/tests/func/tap/tap_interface.robot similarity index 100% rename from tests/suites/tap/tap_interface.robot rename to tests/func/tap/tap_interface.robot diff --git a/tests/suites/vlan/qinq_l2_xconnect.robot b/tests/func/vlan/qinq_l2_xconnect.robot similarity index 100% rename from tests/suites/vlan/qinq_l2_xconnect.robot rename to tests/func/vlan/qinq_l2_xconnect.robot diff --git a/tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot similarity index 100% rename from tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot rename to tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot diff --git a/tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot b/tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot similarity index 100% rename from tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot rename to tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot diff --git a/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot similarity index 100% rename from tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot rename to tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot diff --git a/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot b/tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot similarity index 100% rename from tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot rename to tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot diff --git a/tests/suites/vrf/vrf_tests.robot b/tests/func/vrf/vrf_tests.robot similarity index 100% rename from tests/suites/vrf/vrf_tests.robot rename to tests/func/vrf/vrf_tests.robot diff --git a/tests/suites/vxlan/vxlan_bd_dot1q.robot b/tests/func/vxlan/vxlan_bd_dot1q.robot similarity index 100% rename from tests/suites/vxlan/vxlan_bd_dot1q.robot rename to tests/func/vxlan/vxlan_bd_dot1q.robot diff --git a/tests/suites/vxlan/vxlan_bd_untagged.robot b/tests/func/vxlan/vxlan_bd_untagged.robot similarity index 100% rename from tests/suites/vxlan/vxlan_bd_untagged.robot rename to tests/func/vxlan/vxlan_bd_untagged.robot diff --git a/tests/suites/vxlan/vxlan_xconnect_untagged.robot b/tests/func/vxlan/vxlan_xconnect_untagged.robot similarity index 100% rename from tests/suites/vxlan/vxlan_xconnect_untagged.robot rename to tests/func/vxlan/vxlan_xconnect_untagged.robot diff --git a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot b/tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot rename to tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot rename to tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot rename to tests/perf/Long_IPv4_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot b/tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot rename to tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot b/tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot rename to tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot b/tests/perf/Long_IPv6_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot rename to tests/perf/Long_IPv6_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot rename to tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot rename to tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot b/tests/perf/Long_Xconnect_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot rename to tests/perf/Long_Xconnect_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot b/tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot rename to tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot rename to tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot rename to tests/perf/Short_IPv4_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot b/tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot rename to tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot b/tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot rename to tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot b/tests/perf/Short_IPv6_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot rename to tests/perf/Short_IPv6_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot rename to tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot rename to tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot diff --git a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot b/tests/perf/Short_Xconnect_Intel-X520-DA2.robot similarity index 100% rename from tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot rename to tests/perf/Short_Xconnect_Intel-X520-DA2.robot diff --git a/tests/perf/__init__.robot b/tests/perf/__init__.robot new file mode 100644 index 0000000000..595bd7d4ab --- /dev/null +++ b/tests/perf/__init__.robot @@ -0,0 +1,19 @@ +# Copyright (c) 2016 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/default.robot +| Resource | resources/libraries/robot/interfaces.robot +| Library | resources.libraries.python.SetupFramework +| Suite Setup | Run Keywords | Setup Framework | ${nodes} +| ... | AND | Setup All DUTs | ${nodes} -- 2.16.6