67 files changed, 34 insertions, 9 deletions
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
index 2016146e3b..2016146e3b 100644
--- a/tests/suites/__init__.robot
+++ b/tests/func/__init__.robot
diff --git a/tests/suites/bridge_domain/bridge_domain_untagged.robot b/tests/func/bridge_domain/bridge_domain_untagged.robot
index 1876d901bb..1876d901bb 100644
--- a/tests/suites/bridge_domain/bridge_domain_untagged.robot
+++ b/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
index c84387d349..c84387d349 100644
--- a/tests/suites/cop/cop_whitelist_blacklist.robot
+++ b/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
index 3fb9428680..3fb9428680 100644
--- a/tests/suites/cop/cop_whitelist_blacklist_IPv6.robot
+++ b/tests/func/cop/cop_whitelist_blacklist_IPv6.robot
diff --git a/tests/suites/dhcp/dhcp_client.robot b/tests/func/dhcp/dhcp_client.robot
index eb34544d0b..eb34544d0b 100644
--- a/tests/suites/dhcp/dhcp_client.robot
+++ b/tests/func/dhcp/dhcp_client.robot
diff --git a/tests/suites/fds_related_tests/provider_network.robot b/tests/func/fds/provider_network.robot
index bda5525885..bda5525885 100644
--- a/tests/suites/fds_related_tests/provider_network.robot
+++ b/tests/func/fds/provider_network.robot
diff --git a/tests/suites/fds_related_tests/tenant_network.robot b/tests/func/fds/tenant_network.robot
index e57b374583..e57b374583 100644
--- a/tests/suites/fds_related_tests/tenant_network.robot
+++ b/tests/func/fds/tenant_network.robot
diff --git a/tests/suites/gre/gre_encapsulation.robot b/tests/func/gre/gre_encapsulation.robot
index 17b3fffff2..17b3fffff2 100644
--- a/tests/suites/gre/gre_encapsulation.robot
+++ b/tests/func/gre/gre_encapsulation.robot
diff --git a/tests/suites/honeycomb/010_interface_management.robot b/tests/func/honeycomb/010_interface_management.robot
index e9798167c7..e9798167c7 100644
--- a/tests/suites/honeycomb/010_interface_management.robot
+++ b/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
index 0bd4463ea0..0bd4463ea0 100644
--- a/tests/suites/honeycomb/020_bridge_domain.robot
+++ b/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
index ec07e104ad..ec07e104ad 100644
--- a/tests/suites/honeycomb/021_l2_fib.robot
+++ b/tests/func/honeycomb/021_l2_fib.robot
diff --git a/tests/suites/honeycomb/030_vxlan.robot b/tests/func/honeycomb/030_vxlan.robot
index 7e192cea47..7e192cea47 100644
--- a/tests/suites/honeycomb/030_vxlan.robot
+++ b/tests/func/honeycomb/030_vxlan.robot
diff --git a/tests/suites/honeycomb/031_vxlan_gpe.robot b/tests/func/honeycomb/031_vxlan_gpe.robot
index 5c51319070..5c51319070 100644
--- a/tests/suites/honeycomb/031_vxlan_gpe.robot
+++ b/tests/func/honeycomb/031_vxlan_gpe.robot
diff --git a/tests/suites/honeycomb/040_tap.robot b/tests/func/honeycomb/040_tap.robot
index 329ca8a3c1..329ca8a3c1 100644
--- a/tests/suites/honeycomb/040_tap.robot
+++ b/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
index 2c2a5ae91a..2c2a5ae91a 100644
--- a/tests/suites/honeycomb/050_interface_vhost_user.robot
+++ b/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
index e67638ab97..e67638ab97 100644
--- a/tests/suites/honeycomb/060_sub_interface.robot
+++ b/tests/func/honeycomb/060_sub_interface.robot
diff --git a/tests/suites/honeycomb/070_netconf.robot b/tests/func/honeycomb/070_netconf.robot
index 9925dee15f..9925dee15f 100644
--- a/tests/suites/honeycomb/070_netconf.robot
+++ b/tests/func/honeycomb/070_netconf.robot
diff --git a/tests/suites/honeycomb/071_notification.robot b/tests/func/honeycomb/071_notification.robot
index 117f024b21..117f024b21 100644
--- a/tests/suites/honeycomb/071_notification.robot
+++ b/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
index 146a02edd3..146a02edd3 100644
--- a/tests/suites/honeycomb/080_access_control_lists.robot
+++ b/tests/func/honeycomb/080_access_control_lists.robot
diff --git a/tests/suites/honeycomb/900_persistence.robot b/tests/func/honeycomb/900_persistence.robot
index e3f68ccc33..e3f68ccc33 100644
--- a/tests/suites/honeycomb/900_persistence.robot
+++ b/tests/func/honeycomb/900_persistence.robot
diff --git a/tests/suites/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot
index d38852a090..d38852a090 100644
--- a/tests/suites/honeycomb/__init__.robot
+++ b/tests/func/honeycomb/__init__.robot
diff --git a/tests/suites/iacl/ipv4_iacl_untagged.robot b/tests/func/iacl/ipv4_iacl_untagged.robot
index d840f38538..d840f38538 100644
--- a/tests/suites/iacl/ipv4_iacl_untagged.robot
+++ b/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
index db814b221b..db814b221b 100644
--- a/tests/suites/iacl/ipv6_iacl_untagged.robot
+++ b/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
index 071ce1b34c..071ce1b34c 100644
--- a/tests/suites/iacl/l2_iacl_untagged.robot
+++ b/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
index 5bec624262..5bec624262 100644
--- a/tests/suites/ipv4/ipv4_arp_untagged.robot
+++ b/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
index 716a84b900..716a84b900 100644
--- a/tests/suites/ipv4/ipv4_proxy_arp_untagged.robot
+++ b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot
diff --git a/tests/suites/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot
index 3b6716d858..3b6716d858 100644
--- a/tests/suites/ipv4/ipv4_untagged.robot
+++ b/tests/func/ipv4/ipv4_untagged.robot
diff --git a/tests/suites/ipv6/ipv6_ra.robot b/tests/func/ipv6/ipv6_ra.robot
index cf6d09ef8e..cf6d09ef8e 100644
--- a/tests/suites/ipv6/ipv6_ra.robot
+++ b/tests/func/ipv6/ipv6_ra.robot
diff --git a/tests/suites/ipv6/ipv6_untagged.robot b/tests/func/ipv6/ipv6_untagged.robot
index 8557182a5f..8557182a5f 100644
--- a/tests/suites/ipv6/ipv6_untagged.robot
+++ b/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
index 05da05308d..05da05308d 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/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
index f92a92d435..f92a92d435 100644
--- a/tests/suites/lisp/lisp_api_untagged.robot
+++ b/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
index 0808d366c6..0808d366c6 100644
--- a/tests/suites/lisp/lisp_dataplane_untagged.robot
+++ b/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
index c91436a1f1..c91436a1f1 100644
--- a/tests/suites/rpf/ipv4_rpf_untagged.robot
+++ b/tests/func/rpf/ipv4_rpf_untagged.robot
diff --git a/tests/suites/softwire/lightweight_4over6.robot b/tests/func/softwire/lightweight_4over6.robot
index 68eea42d8e..68eea42d8e 100644
--- a/tests/suites/softwire/lightweight_4over6.robot
+++ b/tests/func/softwire/lightweight_4over6.robot
diff --git a/tests/suites/tap/tap_interface.robot b/tests/func/tap/tap_interface.robot
index d32a970aca..d32a970aca 100644
--- a/tests/suites/tap/tap_interface.robot
+++ b/tests/func/tap/tap_interface.robot
diff --git a/tests/suites/vlan/qinq_l2_xconnect.robot b/tests/func/vlan/qinq_l2_xconnect.robot
index 35fdcde6ca..35fdcde6ca 100644
--- a/tests/suites/vlan/qinq_l2_xconnect.robot
+++ b/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
index 0ff10cd328..0ff10cd328 100644
--- a/tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot
+++ b/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
index e3d2d39dd5..e3d2d39dd5 100644
--- a/tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot
+++ b/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
index f1a954f4d0..f1a954f4d0 100644
--- a/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot
+++ b/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
index 9557fb9d6b..9557fb9d6b 100644
--- a/tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot
+++ b/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
index 239900c1eb..239900c1eb 100644
--- a/tests/suites/vrf/vrf_tests.robot
+++ b/tests/func/vrf/vrf_tests.robot
diff --git a/tests/suites/vxlan/vxlan_bd_dot1q.robot b/tests/func/vxlan/vxlan_bd_dot1q.robot
index 425017ea67..425017ea67 100644
--- a/tests/suites/vxlan/vxlan_bd_dot1q.robot
+++ b/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
index f579f11d57..f579f11d57 100644
--- a/tests/suites/vxlan/vxlan_bd_untagged.robot
+++ b/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
index 32e8c9f478..32e8c9f478 100644
--- a/tests/suites/vxlan/vxlan_xconnect_untagged.robot
+++ b/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
index 00f301e51b..00f301e51b 100644
--- a/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
+++ b/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
index 802ec7b76d..802ec7b76d 100644
--- a/tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot
+++ b/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
index 749ee138a0..749ee138a0 100644
--- a/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
+++ b/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
index acf624514b..acf624514b 100644
--- a/tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/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
index 8f80e738b3..8f80e738b3 100644
--- a/tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot
+++ b/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
index 5664ce4b36..5664ce4b36 100644
--- a/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
+++ b/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
index 09d93983fe..09d93983fe 100644
--- a/tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot
+++ b/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
index 86716f460d..86716f460d 100644
--- a/tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/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
index 01f692db9e..01f692db9e 100644
--- a/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
+++ b/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
index c6ddbaba28..c6ddbaba28 100644
--- a/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
+++ b/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
index 1a6e15acaf..1a6e15acaf 100644
--- a/tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot
+++ b/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
index 9e60561656..9e60561656 100644
--- a/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
+++ b/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
index ea4a0871d1..ea4a0871d1 100644
--- a/tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot
+++ b/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
index 5ef42c5a86..5ef42c5a86 100644
--- a/tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot
+++ b/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
index cf163a9e44..cf163a9e44 100644
--- a/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
+++ b/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
index 5779dc54f4..5779dc54f4 100644
--- a/tests/suites/performance/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot
+++ b/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
index b2eb1ad9a5..b2eb1ad9a5 100644
--- a/tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot
+++ b/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
index 56df7a4ead..56df7a4ead 100644
--- a/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot
+++ b/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}