From 0cf1f0204e326cf93e36b344e2efd3cfa2f82870 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 19 Mar 2018 21:12:03 +0100 Subject: [PATCH] HC Tests: move honeycomb tests out of vpp directory https://gerrit.fd.io/r/#/c/9257/ moved VPP instalation to vpp/func/__init__.robot, which is run before Honeycomb suite. Instalation process starts with removing all vpp packages, which fails because of honeycomb dependency installed by bootstrap script. This patch fixes HC func jobs by moving them to separate dir. The honeycomb/func/__init__.robot was updated to include previous content of vpp/func/__init__.robot. HC perf jobs were also moved, but they may require additional care (CSIT-1006). Change-Id: I99d94272c80a4c57c85ec5cf99cddfbeab7de663 Signed-off-by: Marek Gradzki --- bootstrap-hc2vpp-integration-odl.sh | 2 +- bootstrap-hc2vpp-integration.sh | 2 +- bootstrap-hc2vpp-perf.sh | 2 +- bootstrap-hc2vpp-verify-odl.sh | 2 +- bootstrap-hc2vpp-verify.sh | 2 +- tests/{vpp/func/honeycomb => honeycomb/func}/__init__.robot | 12 ++++++++++-- .../func}/mgmt-cfg-acl-apihc-apivat-func.robot | 0 .../honeycomb => honeycomb/func}/mgmt-cfg-apihcv6-func.robot | 0 .../func}/mgmt-cfg-bgp-apihc-func.robot | 0 .../func}/mgmt-cfg-dhcp-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-int-apihcnc-func.robot | 0 .../func}/mgmt-cfg-int-subint-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-inttap-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-intvhost-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-l2bd-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-l2fib-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-lisp-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-lispgpe-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-nsh-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-pbb-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-pluginacl-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-policer-apihc-func.robot | 0 .../func}/mgmt-cfg-proxyarp-apihc-func.robot | 0 .../func}/mgmt-cfg-proxynd6-apihc-func.robot | 0 .../func}/mgmt-cfg-routing-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-slaac-apihc-func.robot | 0 .../func}/mgmt-cfg-snat44-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-spanrx-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-vxlan-apihc-apivat-func.robot | 0 .../func}/mgmt-cfg-vxlangpe-apihc-apivat-func.robot | 0 .../func}/mgmt-notif-apihcnc-func.robot | 0 .../func}/mgmt-statepersist-apihc-func.robot | 0 tests/{vpp/perf/honeycomb => honeycomb/perf}/__init__.robot | 0 .../perf}/localhostp1-tcp-netconf16t-crud-read.robot | 0 .../perf}/localhostp1-tcp-netconf1t-crud-read.robot | 0 .../perf}/localhostp1-tcp-netconf8t-crud-read.robot | 0 37 files changed, 15 insertions(+), 7 deletions(-) rename tests/{vpp/func/honeycomb => honeycomb/func}/__init__.robot (64%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-acl-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-apihcv6-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-bgp-apihc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-dhcp-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-int-apihcnc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-int-subint-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-inttap-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-intvhost-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-l2bd-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-l2fib-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-lisp-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-lispgpe-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-nsh-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-pbb-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-pluginacl-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-policer-apihc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-proxyarp-apihc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-proxynd6-apihc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-routing-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-slaac-apihc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-snat44-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-spanrx-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-vxlan-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-cfg-vxlangpe-apihc-apivat-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-notif-apihcnc-func.robot (100%) rename tests/{vpp/func/honeycomb => honeycomb/func}/mgmt-statepersist-apihc-func.robot (100%) rename tests/{vpp/perf/honeycomb => honeycomb/perf}/__init__.robot (100%) rename tests/{vpp/perf/honeycomb => honeycomb/perf}/localhostp1-tcp-netconf16t-crud-read.robot (100%) rename tests/{vpp/perf/honeycomb => honeycomb/perf}/localhostp1-tcp-netconf1t-crud-read.robot (100%) rename tests/{vpp/perf/honeycomb => honeycomb/perf}/localhostp1-tcp-netconf8t-crud-read.robot (100%) diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh index 9c5b2e13f2..900e6deee3 100755 --- a/bootstrap-hc2vpp-integration-odl.sh +++ b/bootstrap-hc2vpp-integration-odl.sh @@ -231,7 +231,7 @@ fi # TODO(CSIT-994): reenable NSH PYTHONPATH=`pwd` pybot -L TRACE -W 136\ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - --suite "tests.vpp.func" \ + --suite "tests.honeycomb.func" \ --include HC_FUNC \ --exclude HC_NSHORHC_REST_ONLY \ --noncritical EXPECTED_FAILING \ diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh index 02eaade5cb..60cdf6a9dd 100755 --- a/bootstrap-hc2vpp-integration.sh +++ b/bootstrap-hc2vpp-integration.sh @@ -230,7 +230,7 @@ fi # TODO(CSIT-994): reenable NSH PYTHONPATH=`pwd` pybot -L TRACE -W 136\ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - --suite "tests.vpp.func" \ + --suite "tests.honeycomb.func" \ --include HC_FUNC \ --exclude HC_NSH \ --noncritical EXPECTED_FAILING \ diff --git a/bootstrap-hc2vpp-perf.sh b/bootstrap-hc2vpp-perf.sh index 8eeee6fec3..2d5b49d26b 100755 --- a/bootstrap-hc2vpp-perf.sh +++ b/bootstrap-hc2vpp-perf.sh @@ -103,7 +103,7 @@ fi # run full performance test suite and exit on fail pybot ${PYBOT_ARGS} \ -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \ - -s "tests.vpp.perf.honeycomb" \ + -s "tests.honeycomb.perf" \ --variable install_dir:${INSTALLATION_DIR} \ tests/ RETURN_STATUS=$(echo $?) diff --git a/bootstrap-hc2vpp-verify-odl.sh b/bootstrap-hc2vpp-verify-odl.sh index 17af883af7..92422d0269 100755 --- a/bootstrap-hc2vpp-verify-odl.sh +++ b/bootstrap-hc2vpp-verify-odl.sh @@ -230,7 +230,7 @@ cp /nfs/common/karaf_${ODL} ~ # TODO(CSIT-994): reenable NSH PYTHONPATH=`pwd` pybot -L TRACE -W 136\ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - --suite "tests.vpp.func" \ + --suite "tests.honeycomb.func" \ --include HC_FUNC \ --exclude HC_NSHORHC_REST_ONLY \ --noncritical EXPECTED_FAILING \ diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh index 2b6fbe75f5..603a969915 100755 --- a/bootstrap-hc2vpp-verify.sh +++ b/bootstrap-hc2vpp-verify.sh @@ -226,7 +226,7 @@ fi # TODO(CSIT-994): reenable NSH PYTHONPATH=`pwd` pybot -L TRACE -W 136\ -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \ - --suite "tests.vpp.func" \ + --suite "tests.honeycomb.func" \ --include HC_FUNC \ --exclude HC_NSH \ --noncritical EXPECTED_FAILING \ diff --git a/tests/vpp/func/honeycomb/__init__.robot b/tests/honeycomb/func/__init__.robot similarity index 64% rename from tests/vpp/func/honeycomb/__init__.robot rename to tests/honeycomb/func/__init__.robot index 80585a0e61..cb25ee909d 100644 --- a/tests/vpp/func/honeycomb/__init__.robot +++ b/tests/honeycomb/func/__init__.robot @@ -16,13 +16,21 @@ | ${node}= | ${nodes['DUT1']} *** Settings *** +| Library | resources.libraries.python.SetupFramework +| Library | resources.libraries.python.SetupFramework.CleanupFramework | Library | resources/libraries/python/honeycomb/HcPersistence.py | Resource | resources/libraries/robot/shared/default.robot +| Resource | resources/libraries/robot/shared/interfaces.robot +| Resource | resources/libraries/robot/shared/default.robot | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | ... -| Suite Setup | Run Keywords | Configure all DUTs before test | AND +| Suite Setup | Run Keywords | Setup Framework | ${nodes} | AND +| ... | Setup All DUTs | ${nodes} | AND +| ... | Update All Interface Data On All Nodes | ${nodes} | AND +| ... | Configure all DUTs before test | AND | ... | Set Global Variable | ${node} | AND | ... | Stop Honeycomb service on DUTs | ${node} | AND | ... | Clear Honeycomb Log | ${node} | ... -| Suite Teardown | Archive Honeycomb log file | ${node} +| Suite Teardown | Run Keywords | Archive Honeycomb log file | ${node} | AND +| ... | Cleanup Framework | ${nodes} diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-acl-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-acl-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-apihcv6-func.robot b/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-apihcv6-func.robot rename to tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-bgp-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-bgp-apihc-func.robot rename to tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/honeycomb/func/mgmt-cfg-int-apihcnc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot rename to tests/honeycomb/func/mgmt-cfg-int-apihcnc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-int-subint-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-inttap-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-inttap-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-inttap-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intvhost-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-intvhost-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-intvhost-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-l2bd-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-l2bd-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-l2fib-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-lisp-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-lisp-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-lispgpe-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-lispgpe-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-nsh-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-nsh-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pbb-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-pbb-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-pbb-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-policer-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot rename to tests/honeycomb/func/mgmt-cfg-policer-apihc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-proxyarp-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot rename to tests/honeycomb/func/mgmt-cfg-proxyarp-apihc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-proxynd6-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot rename to tests/honeycomb/func/mgmt-cfg-proxynd6-apihc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-routing-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-slaac-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot rename to tests/honeycomb/func/mgmt-cfg-slaac-apihc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-snat44-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-snat44-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-snat44-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-spanrx-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-spanrx-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-vxlan-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-vxlan-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-vxlangpe-apihc-apivat-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-cfg-vxlangpe-apihc-apivat-func.robot rename to tests/honeycomb/func/mgmt-cfg-vxlangpe-apihc-apivat-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/honeycomb/func/mgmt-notif-apihcnc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot rename to tests/honeycomb/func/mgmt-notif-apihcnc-func.robot diff --git a/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/honeycomb/func/mgmt-statepersist-apihc-func.robot similarity index 100% rename from tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot rename to tests/honeycomb/func/mgmt-statepersist-apihc-func.robot diff --git a/tests/vpp/perf/honeycomb/__init__.robot b/tests/honeycomb/perf/__init__.robot similarity index 100% rename from tests/vpp/perf/honeycomb/__init__.robot rename to tests/honeycomb/perf/__init__.robot diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf16t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf16t-crud-read.robot similarity index 100% rename from tests/vpp/perf/honeycomb/localhostp1-tcp-netconf16t-crud-read.robot rename to tests/honeycomb/perf/localhostp1-tcp-netconf16t-crud-read.robot diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf1t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf1t-crud-read.robot similarity index 100% rename from tests/vpp/perf/honeycomb/localhostp1-tcp-netconf1t-crud-read.robot rename to tests/honeycomb/perf/localhostp1-tcp-netconf1t-crud-read.robot diff --git a/tests/vpp/perf/honeycomb/localhostp1-tcp-netconf8t-crud-read.robot b/tests/honeycomb/perf/localhostp1-tcp-netconf8t-crud-read.robot similarity index 100% rename from tests/vpp/perf/honeycomb/localhostp1-tcp-netconf8t-crud-read.robot rename to tests/honeycomb/perf/localhostp1-tcp-netconf8t-crud-read.robot -- 2.16.6