CSIT-220: Rename directories in tests directory 55/2055/4
authorMatej Klotton <mklotton@cisco.com>
Fri, 22 Jul 2016 07:34:25 +0000 (09:34 +0200)
committerMatej Klotton <mklotton@cisco.com>
Fri, 22 Jul 2016 11:32:53 +0000 (13:32 +0200)
- 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 <mklotton@cisco.com>
67 files changed:
bootstrap-verify-perf.sh
bootstrap-vpp-verify-semiweekly.sh
bootstrap-vpp-verify-weekly.sh
bootstrap.sh
tests/func/__init__.robot [moved from tests/suites/__init__.robot with 100% similarity]
tests/func/bridge_domain/bridge_domain_untagged.robot [moved from tests/suites/bridge_domain/bridge_domain_untagged.robot with 100% similarity]
tests/func/cop/cop_whitelist_blacklist.robot [moved from tests/suites/cop/cop_whitelist_blacklist.robot with 100% similarity]
tests/func/cop/cop_whitelist_blacklist_IPv6.robot [moved from tests/suites/cop/cop_whitelist_blacklist_IPv6.robot with 100% similarity]
tests/func/dhcp/dhcp_client.robot [moved from tests/suites/dhcp/dhcp_client.robot with 100% similarity]
tests/func/fds/provider_network.robot [moved from tests/suites/fds_related_tests/provider_network.robot with 100% similarity]
tests/func/fds/tenant_network.robot [moved from tests/suites/fds_related_tests/tenant_network.robot with 100% similarity]
tests/func/gre/gre_encapsulation.robot [moved from tests/suites/gre/gre_encapsulation.robot with 100% similarity]
tests/func/honeycomb/010_interface_management.robot [moved from tests/suites/honeycomb/010_interface_management.robot with 100% similarity]
tests/func/honeycomb/020_bridge_domain.robot [moved from tests/suites/honeycomb/020_bridge_domain.robot with 100% similarity]
tests/func/honeycomb/021_l2_fib.robot [moved from tests/suites/honeycomb/021_l2_fib.robot with 100% similarity]
tests/func/honeycomb/030_vxlan.robot [moved from tests/suites/honeycomb/030_vxlan.robot with 100% similarity]
tests/func/honeycomb/031_vxlan_gpe.robot [moved from tests/suites/honeycomb/031_vxlan_gpe.robot with 100% similarity]
tests/func/honeycomb/040_tap.robot [moved from tests/suites/honeycomb/040_tap.robot with 100% similarity]
tests/func/honeycomb/050_interface_vhost_user.robot [moved from tests/suites/honeycomb/050_interface_vhost_user.robot with 100% similarity]
tests/func/honeycomb/060_sub_interface.robot [moved from tests/suites/honeycomb/060_sub_interface.robot with 100% similarity]
tests/func/honeycomb/070_netconf.robot [moved from tests/suites/honeycomb/070_netconf.robot with 100% similarity]
tests/func/honeycomb/071_notification.robot [moved from tests/suites/honeycomb/071_notification.robot with 100% similarity]
tests/func/honeycomb/080_access_control_lists.robot [moved from tests/suites/honeycomb/080_access_control_lists.robot with 100% similarity]
tests/func/honeycomb/900_persistence.robot [moved from tests/suites/honeycomb/900_persistence.robot with 100% similarity]
tests/func/honeycomb/__init__.robot [moved from tests/suites/honeycomb/__init__.robot with 100% similarity]
tests/func/iacl/ipv4_iacl_untagged.robot [moved from tests/suites/iacl/ipv4_iacl_untagged.robot with 100% similarity]
tests/func/iacl/ipv6_iacl_untagged.robot [moved from tests/suites/iacl/ipv6_iacl_untagged.robot with 100% similarity]
tests/func/iacl/l2_iacl_untagged.robot [moved from tests/suites/iacl/l2_iacl_untagged.robot with 100% similarity]
tests/func/ipv4/ipv4_arp_untagged.robot [moved from tests/suites/ipv4/ipv4_arp_untagged.robot with 100% similarity]
tests/func/ipv4/ipv4_proxy_arp_untagged.robot [moved from tests/suites/ipv4/ipv4_proxy_arp_untagged.robot with 100% similarity]
tests/func/ipv4/ipv4_untagged.robot [moved from tests/suites/ipv4/ipv4_untagged.robot with 100% similarity]
tests/func/ipv6/ipv6_ra.robot [moved from tests/suites/ipv6/ipv6_ra.robot with 100% similarity]
tests/func/ipv6/ipv6_untagged.robot [moved from tests/suites/ipv6/ipv6_untagged.robot with 100% similarity]
tests/func/l2_xconnect/l2_xconnect_untagged.robot [moved from tests/suites/l2_xconnect/l2_xconnect_untagged.robot with 100% similarity]
tests/func/lisp/lisp_api_untagged.robot [moved from tests/suites/lisp/lisp_api_untagged.robot with 100% similarity]
tests/func/lisp/lisp_dataplane_untagged.robot [moved from tests/suites/lisp/lisp_dataplane_untagged.robot with 100% similarity]
tests/func/rpf/ipv4_rpf_untagged.robot [moved from tests/suites/rpf/ipv4_rpf_untagged.robot with 100% similarity]
tests/func/softwire/lightweight_4over6.robot [moved from tests/suites/softwire/lightweight_4over6.robot with 100% similarity]
tests/func/tap/tap_interface.robot [moved from tests/suites/tap/tap_interface.robot with 100% similarity]
tests/func/vlan/qinq_l2_xconnect.robot [moved from tests/suites/vlan/qinq_l2_xconnect.robot with 100% similarity]
tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot [moved from tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv4.robot with 100% similarity]
tests/func/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot [moved from tests/suites/vlan/vlan_tag_translate_l2_bridge_domain_ipv6.robot with 100% similarity]
tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot [moved from tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv4.robot with 100% similarity]
tests/func/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot [moved from tests/suites/vlan/vlan_tag_translate_l2_xconnect_ipv6.robot with 100% similarity]
tests/func/vrf/vrf_tests.robot [moved from tests/suites/vrf/vrf_tests.robot with 100% similarity]
tests/func/vxlan/vxlan_bd_dot1q.robot [moved from tests/suites/vxlan/vxlan_bd_dot1q.robot with 100% similarity]
tests/func/vxlan/vxlan_bd_untagged.robot [moved from tests/suites/vxlan/vxlan_bd_untagged.robot with 100% similarity]
tests/func/vxlan/vxlan_xconnect_untagged.robot [moved from tests/suites/vxlan/vxlan_xconnect_untagged.robot with 100% similarity]
tests/perf/Long_Bridge_Domain_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_IPv4_Cop_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_IPv4_Cop_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_IPv4_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_IPv4_iAcl_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_IPv4_iAcl_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_IPv6_Cop_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_IPv6_Cop_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_IPv6_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_Xconnect_Dot1ad_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_Xconnect_Dot1q_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_Xconnect_Dot1q_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Long_Xconnect_Intel-X520-DA2.robot [moved from tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_Bridge_Domain_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_IPv4_Cop_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_IPv4_Cop_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_IPv4_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_IPv4_iAcl_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_IPv4_iAcl_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_IPv6_Cop_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_IPv6_Cop_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_IPv6_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_Xconnect_Dot1ad_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_Xconnect_Dot1q_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_Xconnect_Dot1q_Intel-X520-DA2.robot with 100% similarity]
tests/perf/Short_Xconnect_Intel-X520-DA2.robot [moved from tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot with 100% similarity]
tests/perf/__init__.robot [new file with mode: 0644]

index b891bff..e58548e 100755 (executable)
@@ -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
index 10f0f90..4e8daa5 100644 (file)
@@ -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/
index 3a67475..b4a3e8f 100644 (file)
@@ -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 \
index 5d5a7ae..1eb0716 100755 (executable)
@@ -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/perf/__init__.robot b/tests/perf/__init__.robot
new file mode 100644 (file)
index 0000000..595bd7d
--- /dev/null
@@ -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}

©2016 FD.io a Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation. Linux is a registered trademark of Linus Torvalds.
Please see our privacy policy and terms of use.