Reorganize the project folders

Code from Brahmaputra is no longer maintained, including:

- docker
- playbooks
- scripts
- utils

They are moved to legacy folder to avoid unnecessary confusion to new developers.

Change-Id: Ia50383ca5c3bd82571eb7b2184e7f83e264ff8a7
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/legacy/DO-NOT-DELETE b/legacy/DO-NOT-DELETE
new file mode 100644 (file)
index 0000000..fdecaad
--- /dev/null
+++ b/legacy/DO-NOT-DELETE
@@ -0,0 +1,2 @@
+The legacy code is no longer maintained. But they should be kept until we finish
+migration to new architecture.

diff --git a/qtip/agent/__init__.py b/legacy/__init__.py
similarity index 100%
rename from qtip/agent/__init__.py
rename to legacy/__init__.py

diff --git a/qtip/api/handler/__init__.py b/legacy/api/__init__.py
similarity index 100%
rename from qtip/api/handler/__init__.py
rename to legacy/api/__init__.py

diff --git a/qtip/api/model/__init__.py b/legacy/api/handler/__init__.py
similarity index 100%
rename from qtip/api/model/__init__.py
rename to legacy/api/handler/__init__.py

diff --git a/qtip/api/handler/db.py b/legacy/api/handler/db.py
similarity index 100%
rename from qtip/api/handler/db.py
rename to legacy/api/handler/db.py

diff --git a/qtip/api/handler/job_handler.py b/legacy/api/handler/job_handler.py
similarity index 99%
rename from qtip/api/handler/job_handler.py
rename to legacy/api/handler/job_handler.py
index eade9df..b75da5f 100644 (file)
--- a/qtip/api/handler/job_handler.py
+++ b/legacy/api/handler/job_handler.py
@@ -3,11 +3,11 @@ from copy import copy
 
 from flask_restful import Resource, reqparse
 from flask_restful_swagger import swagger
-from werkzeug.exceptions import abort
-
-from qtip.api.handler import db, result_handler
 from qtip.api.model.job_model import JobResponseModel
 from qtip.utils import args_handler as args_handler
+from werkzeug.exceptions import abort
+
+from legacy.api.handler import db, result_handler
 
 
 class Job(Resource):

diff --git a/qtip/api/handler/result_handler.py b/legacy/api/handler/result_handler.py
similarity index 100%
rename from qtip/api/handler/result_handler.py
rename to legacy/api/handler/result_handler.py

diff --git a/qtip/api/router/__init__.py b/legacy/api/model/__init__.py
similarity index 100%
rename from qtip/api/router/__init__.py
rename to legacy/api/model/__init__.py

diff --git a/qtip/api/model/job_model.py b/legacy/api/model/job_model.py
similarity index 100%
rename from qtip/api/model/job_model.py
rename to legacy/api/model/job_model.py

diff --git a/qtip/utils/__init__.py b/legacy/api/router/__init__.py
similarity index 100%
rename from qtip/utils/__init__.py
rename to legacy/api/router/__init__.py

diff --git a/qtip/api/router/mapper.py b/legacy/api/router/mapper.py
similarity index 62%
rename from qtip/api/router/mapper.py
rename to legacy/api/router/mapper.py
index a5f029a..8839f3f 100644 (file)
--- a/qtip/api/router/mapper.py
+++ b/legacy/api/router/mapper.py
@@ -1,4 +1,4 @@
-from qtip.api.handler.job_handler import Job, JobList
+from legacy.api.handler import Job, JobList
 
 
 mappers = [

diff --git a/benchmarks/perftest/common/git_proxy_pbook.yaml b/legacy/assets/perftest/common/git_proxy_pbook.yaml
similarity index 100%
rename from benchmarks/perftest/common/git_proxy_pbook.yaml
rename to legacy/assets/perftest/common/git_proxy_pbook.yaml

diff --git a/benchmarks/perftest/common/sys_info_pbook.yaml b/legacy/assets/perftest/common/sys_info_pbook.yaml
similarity index 100%
rename from benchmarks/perftest/common/sys_info_pbook.yaml
rename to legacy/assets/perftest/common/sys_info_pbook.yaml

diff --git a/benchmarks/perftest/common/sys_proxy_pbook.yaml b/legacy/assets/perftest/common/sys_proxy_pbook.yaml
similarity index 100%
rename from benchmarks/perftest/common/sys_proxy_pbook.yaml
rename to legacy/assets/perftest/common/sys_proxy_pbook.yaml

diff --git a/benchmarks/perftest/dhrystone.yaml b/legacy/assets/perftest/dhrystone.yaml
similarity index 100%
rename from benchmarks/perftest/dhrystone.yaml
rename to legacy/assets/perftest/dhrystone.yaml

diff --git a/benchmarks/perftest/dpi.yaml b/legacy/assets/perftest/dpi.yaml
similarity index 100%
rename from benchmarks/perftest/dpi.yaml
rename to legacy/assets/perftest/dpi.yaml

diff --git a/benchmarks/perftest/etc/dpi_average.sh b/legacy/assets/perftest/etc/dpi_average.sh
similarity index 100%
rename from benchmarks/perftest/etc/dpi_average.sh
rename to legacy/assets/perftest/etc/dpi_average.sh

diff --git a/benchmarks/perftest/etc/fio_test_job b/legacy/assets/perftest/etc/fio_test_job
similarity index 100%
rename from benchmarks/perftest/etc/fio_test_job
rename to legacy/assets/perftest/etc/fio_test_job

diff --git a/benchmarks/perftest/etc/info_collect.py b/legacy/assets/perftest/etc/info_collect.py
similarity index 100%
rename from benchmarks/perftest/etc/info_collect.py
rename to legacy/assets/perftest/etc/info_collect.py

diff --git a/benchmarks/perftest/fio.yaml b/legacy/assets/perftest/fio.yaml
similarity index 100%
rename from benchmarks/perftest/fio.yaml
rename to legacy/assets/perftest/fio.yaml

diff --git a/benchmarks/perftest/iperf.yaml b/legacy/assets/perftest/iperf.yaml
similarity index 100%
rename from benchmarks/perftest/iperf.yaml
rename to legacy/assets/perftest/iperf.yaml

diff --git a/benchmarks/perftest/ramspeed.yaml b/legacy/assets/perftest/ramspeed.yaml
similarity index 100%
rename from benchmarks/perftest/ramspeed.yaml
rename to legacy/assets/perftest/ramspeed.yaml

diff --git a/benchmarks/perftest/ssl.yaml b/legacy/assets/perftest/ssl.yaml
similarity index 100%
rename from benchmarks/perftest/ssl.yaml
rename to legacy/assets/perftest/ssl.yaml

diff --git a/benchmarks/perftest/summary b/legacy/assets/perftest/summary
similarity index 100%
rename from benchmarks/perftest/summary
rename to legacy/assets/perftest/summary

diff --git a/benchmarks/perftest/whetstone.yaml b/legacy/assets/perftest/whetstone.yaml
similarity index 100%
rename from benchmarks/perftest/whetstone.yaml
rename to legacy/assets/perftest/whetstone.yaml

diff --git a/benchmarks/suite/compute b/legacy/assets/suite/compute
similarity index 100%
rename from benchmarks/suite/compute
rename to legacy/assets/suite/compute

diff --git a/benchmarks/suite/compute.yaml b/legacy/assets/suite/compute.yaml
similarity index 100%
rename from benchmarks/suite/compute.yaml
rename to legacy/assets/suite/compute.yaml

diff --git a/benchmarks/suite/network b/legacy/assets/suite/network
similarity index 100%
rename from benchmarks/suite/network
rename to legacy/assets/suite/network

diff --git a/benchmarks/suite/storage b/legacy/assets/suite/storage
similarity index 100%
rename from benchmarks/suite/storage
rename to legacy/assets/suite/storage

diff --git a/benchmarks/testplan/default/compute/dhrystone_bm.yaml b/legacy/assets/testplan/default/compute/dhrystone_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/dhrystone_bm.yaml
rename to legacy/assets/testplan/default/compute/dhrystone_bm.yaml

diff --git a/benchmarks/testplan/default/compute/dhrystone_vm.yaml b/legacy/assets/testplan/default/compute/dhrystone_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/dhrystone_vm.yaml
rename to legacy/assets/testplan/default/compute/dhrystone_vm.yaml

diff --git a/benchmarks/testplan/default/compute/dpi_bm.yaml b/legacy/assets/testplan/default/compute/dpi_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/dpi_bm.yaml
rename to legacy/assets/testplan/default/compute/dpi_bm.yaml

diff --git a/benchmarks/testplan/default/compute/dpi_vm.yaml b/legacy/assets/testplan/default/compute/dpi_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/dpi_vm.yaml
rename to legacy/assets/testplan/default/compute/dpi_vm.yaml

diff --git a/benchmarks/testplan/default/compute/ramspeed_bm.yaml b/legacy/assets/testplan/default/compute/ramspeed_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/ramspeed_bm.yaml
rename to legacy/assets/testplan/default/compute/ramspeed_bm.yaml

diff --git a/benchmarks/testplan/default/compute/ramspeed_vm.yaml b/legacy/assets/testplan/default/compute/ramspeed_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/ramspeed_vm.yaml
rename to legacy/assets/testplan/default/compute/ramspeed_vm.yaml

diff --git a/benchmarks/testplan/default/compute/ssl_bm.yaml b/legacy/assets/testplan/default/compute/ssl_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/ssl_bm.yaml
rename to legacy/assets/testplan/default/compute/ssl_bm.yaml

diff --git a/benchmarks/testplan/default/compute/ssl_vm.yaml b/legacy/assets/testplan/default/compute/ssl_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/ssl_vm.yaml
rename to legacy/assets/testplan/default/compute/ssl_vm.yaml

diff --git a/benchmarks/testplan/default/compute/whetstone_bm.yaml b/legacy/assets/testplan/default/compute/whetstone_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/whetstone_bm.yaml
rename to legacy/assets/testplan/default/compute/whetstone_bm.yaml

diff --git a/benchmarks/testplan/default/compute/whetstone_vm.yaml b/legacy/assets/testplan/default/compute/whetstone_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/compute/whetstone_vm.yaml
rename to legacy/assets/testplan/default/compute/whetstone_vm.yaml

diff --git a/benchmarks/testplan/default/network/iperf_bm.yaml b/legacy/assets/testplan/default/network/iperf_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/network/iperf_bm.yaml
rename to legacy/assets/testplan/default/network/iperf_bm.yaml

diff --git a/benchmarks/testplan/default/network/iperf_vm.yaml b/legacy/assets/testplan/default/network/iperf_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/network/iperf_vm.yaml
rename to legacy/assets/testplan/default/network/iperf_vm.yaml

diff --git a/benchmarks/testplan/default/network/iperf_vm_2.yaml b/legacy/assets/testplan/default/network/iperf_vm_2.yaml
similarity index 100%
rename from benchmarks/testplan/default/network/iperf_vm_2.yaml
rename to legacy/assets/testplan/default/network/iperf_vm_2.yaml

diff --git a/benchmarks/testplan/default/storage/fio_bm.yaml b/legacy/assets/testplan/default/storage/fio_bm.yaml
similarity index 100%
rename from benchmarks/testplan/default/storage/fio_bm.yaml
rename to legacy/assets/testplan/default/storage/fio_bm.yaml

diff --git a/benchmarks/testplan/default/storage/fio_vm.yaml b/legacy/assets/testplan/default/storage/fio_vm.yaml
similarity index 100%
rename from benchmarks/testplan/default/storage/fio_vm.yaml
rename to legacy/assets/testplan/default/storage/fio_vm.yaml

diff --git a/config/SampleHeat.yaml b/legacy/config/SampleHeat.yaml
similarity index 100%
rename from config/SampleHeat.yaml
rename to legacy/config/SampleHeat.yaml

diff --git a/tests/data/hosts b/legacy/data/hosts
similarity index 100%
rename from tests/data/hosts
rename to legacy/data/hosts

diff --git a/legacy/data/my_key.pem b/legacy/data/my_key.pem
new file mode 100644 (file)
index 0000000..d7c96f2
--- /dev/null
+++ b/legacy/data/my_key.pem
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAntmA9ybqcxQKr9R3iTbNr+89ZJwlt5+gLbT8VR9sUAYCEEJn
+xX7DX5djpSdQ1OoxJun/HE0ByKPXCIqGq3sHnxQ/3Wh80UGlyiSXgS8/p8NlfgPr
+DIDuVNhKJlsobsfTVXL789i512rqf2zFBWfoesFgZee6ACrSYN3hdNICFOwtbmHA
+g+xEs00yGmbcFDuBQnDeR2yPpV6G4AtrU5zwliVj7fMzrB5w9De20ydbFqxjPdOD
+gbfwrhQQs82pv7vfJCFByjsSlwP4mcznKgOt/aO2y/B1ZvL+dOsCi8D3H6Ggrg7R
+wmiIRaCijYX4SycYxdn+RkZpp9g0AyR/potcKwIDAQABAoIBADncgF2Gj1/brQjf
+G6ufiszLGFHNju+T9YSwqDlZeNqtVZMWnTYTNpdbTbCa4Zast7q1AXgNlNjA1VMH
+IobUCbKobZr4tH6Eqx82tPkZfNZfFlkQlE25qRa+skPGcLPpldFKUPxBtXACQeio
+dhvB/ay5Q6PbBKWK85bVO4qR9LApxHCDQgovGtasUF1/wu5z4vOCP3KLtlE268m+
+XJ/4IZX2erBOfxOGPqp+qDK8FTP1NcuGFEkhUa8Tr406CIXptTDyPc+bMZANIGDM
+hhww6VR5aHxsHWgu1UITVZuDh5fJ8U6n2utqTm/QLT25DUPKoTJSAjLet7fnm4Cw
+hee7GgECgYEAziiWq4peA9WrJYTlR8bNRLgsMjZx/AphyJQpFCQsgCMuB9wIluTT
+5Di4jvdvKclsFTh6foxnltltX6O8tL+vrzfbK9fBB3A2T1V1sDMOznhI47Mmoqk6
+9le6aMmpTIhNFJMu1DpsuoxRLIJaNkWLCwWaIE1ZggqCgbjIdMOJt20CgYEAxUDo
+DUf0zi/qYZVVTnziubcqu0kjUWhmeEiv08WFst8l2fAwHBILNms5ot4TY5MlFxta
+vLsWaXC7o6tqofSHF52cD8AbUWEnvK2NtCA7gW+0xBtQEPqrtItA0YjblFXw7qwb
+QUValSo535bFYJjp5foJxTZXg9rErF4iUgExqvcCgYBK5t5PNvePhxsmh5FSMb20
+oQGVwMhLHW6HlKUUJ0xvxdhcjKomQL9npOAROX8O/JqjXyDKR7L/UMH3RKM0PIzV
+KYMc+8erLy7cRh17RiG0DGnXKOj5omjExfz5Q4OaRc9TkWIrQ4rrgD2h4T5rh3rM
+J13nLJM/txfRj9Rs7/piRQKBgCm3RFwqr5c7gvIIRvZGaxyjpCHfodyBm8osdSLw
+Two5LyQcK9CD8GMd4h6ToL4aTGnKmzH2zxKViNlgUzjVIgzYhDzAgAaB6Yl5mtJR
+TsRc/3nJ3PD6Un3oRVkK/IUud7nCJDF1nWaWe47RsARx0mWUr6RJjdCQ368kaVW2
+cu6ZAoGBALD4Gw+AsH6/za7gmRIqlzBURHpHCgKutQKv3UbD1hVc5tDAoYwBjjod
+AVY8N8+AmX/nmJOVcch/dAnICkLrZn5Bm/q52/3xCAlnGkwNHyW4G99lZCfNEQrx
+sVAZ4FNrtMC9Xwtj0o73ojqKP4gxVkljbybnbuyNSXZo14EbXuJU
+-----END RSA PRIVATE KEY-----

diff --git a/tests/data/output/hosts b/legacy/data/output/hosts
similarity index 100%
rename from tests/data/output/hosts
rename to legacy/data/output/hosts

diff --git a/tests/data/schema/test_bm_schema.yaml b/legacy/data/schema/test_bm_schema.yaml
similarity index 100%
rename from tests/data/schema/test_bm_schema.yaml
rename to legacy/data/schema/test_bm_schema.yaml

diff --git a/tests/data/schema/test_vm_schema.yaml b/legacy/data/schema/test_vm_schema.yaml
similarity index 100%
rename from tests/data/schema/test_vm_schema.yaml
rename to legacy/data/schema/test_vm_schema.yaml

diff --git a/tests/data/test.retry b/legacy/data/test.retry
similarity index 100%
rename from tests/data/test.retry
rename to legacy/data/test.retry

diff --git a/tests/data/test.yml b/legacy/data/test.yml
similarity index 100%
rename from tests/data/test.yml
rename to legacy/data/test.yml

diff --git a/tests/data/testplan/bm_ping.yaml b/legacy/data/testplan/bm_ping.yaml
similarity index 100%
rename from tests/data/testplan/bm_ping.yaml
rename to legacy/data/testplan/bm_ping.yaml

diff --git a/tests/data/testplan/bm_with_proxy.yaml b/legacy/data/testplan/bm_with_proxy.yaml
similarity index 100%
rename from tests/data/testplan/bm_with_proxy.yaml
rename to legacy/data/testplan/bm_with_proxy.yaml

diff --git a/tests/data/testplan/bm_without_proxy.yaml b/legacy/data/testplan/bm_without_proxy.yaml
similarity index 100%
rename from tests/data/testplan/bm_without_proxy.yaml
rename to legacy/data/testplan/bm_without_proxy.yaml

diff --git a/tests/data/testplan/vm.yaml b/legacy/data/testplan/vm.yaml
similarity index 100%
rename from tests/data/testplan/vm.yaml
rename to legacy/data/testplan/vm.yaml

diff --git a/tests/data/testplan/vm_error.yaml b/legacy/data/testplan/vm_error.yaml
similarity index 100%
rename from tests/data/testplan/vm_error.yaml
rename to legacy/data/testplan/vm_error.yaml

diff --git a/docker/Dockerfile b/legacy/docker/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to legacy/docker/Dockerfile

diff --git a/docker/README.md b/legacy/docker/README.md
similarity index 100%
rename from docker/README.md
rename to legacy/docker/README.md

diff --git a/docker/ansible.cfg.default b/legacy/docker/ansible.cfg.default
similarity index 100%
rename from docker/ansible.cfg.default
rename to legacy/docker/ansible.cfg.default

diff --git a/docker/cleanup_qtip_image.sh b/legacy/docker/cleanup_qtip_image.sh
similarity index 100%
rename from docker/cleanup_qtip_image.sh
rename to legacy/docker/cleanup_qtip_image.sh

diff --git a/docker/prepare_qtip_image.sh b/legacy/docker/prepare_qtip_image.sh
similarity index 100%
rename from docker/prepare_qtip_image.sh
rename to legacy/docker/prepare_qtip_image.sh

diff --git a/docker/push_db.sh b/legacy/docker/push_db.sh
similarity index 100%
rename from docker/push_db.sh
rename to legacy/docker/push_db.sh

diff --git a/docker/run_qtip.sh b/legacy/docker/run_qtip.sh
similarity index 100%
rename from docker/run_qtip.sh
rename to legacy/docker/run_qtip.sh

diff --git a/docker/supervisord.conf b/legacy/docker/supervisord.conf
similarity index 100%
rename from docker/supervisord.conf
rename to legacy/docker/supervisord.conf

diff --git a/qtip/run.py b/legacy/run.py
similarity index 100%
rename from qtip/run.py
rename to legacy/run.py

diff --git a/qtip/utils/dashboard/__init__.py b/legacy/scripts/__init__.py
similarity index 100%
rename from qtip/utils/dashboard/__init__.py
rename to legacy/scripts/__init__.py

diff --git a/scripts/cleanup_creds.sh b/legacy/scripts/cleanup_creds.sh
similarity index 100%
rename from scripts/cleanup_creds.sh
rename to legacy/scripts/cleanup_creds.sh

diff --git a/scripts/fetch_compute_ips.sh b/legacy/scripts/fetch_compute_ips.sh
similarity index 100%
rename from scripts/fetch_compute_ips.sh
rename to legacy/scripts/fetch_compute_ips.sh

diff --git a/scripts/get_env_info.sh b/legacy/scripts/get_env_info.sh
similarity index 100%
rename from scripts/get_env_info.sh
rename to legacy/scripts/get_env_info.sh

diff --git a/scripts/qtip_creds.sh b/legacy/scripts/qtip_creds.sh
similarity index 100%
rename from scripts/qtip_creds.sh
rename to legacy/scripts/qtip_creds.sh

diff --git a/qtip/utils/report/__init__.py b/legacy/scripts/ref_results/__init__.py
similarity index 100%
rename from qtip/utils/report/__init__.py
rename to legacy/scripts/ref_results/__init__.py

diff --git a/scripts/ref_results/compute_benchmarks_indices.py b/legacy/scripts/ref_results/compute_benchmarks_indices.py
similarity index 100%
rename from scripts/ref_results/compute_benchmarks_indices.py
rename to legacy/scripts/ref_results/compute_benchmarks_indices.py

diff --git a/scripts/ref_results/index_calculation.py b/legacy/scripts/ref_results/index_calculation.py
similarity index 100%
rename from scripts/ref_results/index_calculation.py
rename to legacy/scripts/ref_results/index_calculation.py

diff --git a/scripts/ref_results/network_benchmarks_indices.py b/legacy/scripts/ref_results/network_benchmarks_indices.py
similarity index 100%
rename from scripts/ref_results/network_benchmarks_indices.py
rename to legacy/scripts/ref_results/network_benchmarks_indices.py

diff --git a/scripts/ref_results/reference.json b/legacy/scripts/ref_results/reference.json
similarity index 100%
rename from scripts/ref_results/reference.json
rename to legacy/scripts/ref_results/reference.json

diff --git a/scripts/ref_results/result_accum.py b/legacy/scripts/ref_results/result_accum.py
similarity index 100%
rename from scripts/ref_results/result_accum.py
rename to legacy/scripts/ref_results/result_accum.py

diff --git a/scripts/ref_results/storage_benchmarks_indices.py b/legacy/scripts/ref_results/storage_benchmarks_indices.py
similarity index 100%
rename from scripts/ref_results/storage_benchmarks_indices.py
rename to legacy/scripts/ref_results/storage_benchmarks_indices.py

diff --git a/scripts/ref_results/suite_result.py b/legacy/scripts/ref_results/suite_result.py
similarity index 100%
rename from scripts/ref_results/suite_result.py
rename to legacy/scripts/ref_results/suite_result.py

diff --git a/scripts/ssh_exch.exp b/legacy/scripts/ssh_exch.exp
similarity index 100%
rename from scripts/ssh_exch.exp
rename to legacy/scripts/ssh_exch.exp

diff --git a/qtip/utils/transform/__init__.py b/legacy/tests/__init__.py
similarity index 100%
rename from qtip/utils/transform/__init__.py
rename to legacy/tests/__init__.py

diff --git a/tests/unit/utils/ansible_api_test.py b/legacy/tests/ansible_api_test.py
similarity index 100%
rename from tests/unit/utils/ansible_api_test.py
rename to legacy/tests/ansible_api_test.py

diff --git a/scripts/__init__.py b/legacy/tests/api/__init__.py
similarity index 100%
rename from scripts/__init__.py
rename to legacy/tests/api/__init__.py

diff --git a/tests/unit/api/test_server.py b/legacy/tests/api/test_server.py
similarity index 100%
rename from tests/unit/api/test_server.py
rename to legacy/tests/api/test_server.py

diff --git a/tests/unit/utils/args_handler_test.py b/legacy/tests/args_handler_test.py
similarity index 100%
rename from tests/unit/utils/args_handler_test.py
rename to legacy/tests/args_handler_test.py

diff --git a/tests/unit/utils/cli_test.py b/legacy/tests/cli_test.py
similarity index 100%
rename from tests/unit/utils/cli_test.py
rename to legacy/tests/cli_test.py

diff --git a/tests/unit/utils/create_zones_test.py b/legacy/tests/create_zones_test.py
similarity index 100%
rename from tests/unit/utils/create_zones_test.py
rename to legacy/tests/create_zones_test.py

diff --git a/tests/unit/utils/driver_test.py b/legacy/tests/driver_test.py
similarity index 100%
rename from tests/unit/utils/driver_test.py
rename to legacy/tests/driver_test.py

diff --git a/tests/unit/utils/env_setup_test.py b/legacy/tests/env_setup_test.py
similarity index 100%
rename from tests/unit/utils/env_setup_test.py
rename to legacy/tests/env_setup_test.py

diff --git a/scripts/ref_results/__init__.py b/legacy/tests/functional/__init__.py
similarity index 100%
rename from scripts/ref_results/__init__.py
rename to legacy/tests/functional/__init__.py

diff --git a/tests/functional/yaml_schema_test.py b/legacy/tests/functional/yaml_schema_test.py
similarity index 100%
rename from tests/functional/yaml_schema_test.py
rename to legacy/tests/functional/yaml_schema_test.py

diff --git a/tests/unit/utils/spawn_vm_test.py b/legacy/tests/spawn_vm_test.py
similarity index 100%
rename from tests/unit/utils/spawn_vm_test.py
rename to legacy/tests/spawn_vm_test.py

diff --git a/tests/functional/__init__.py b/legacy/utils/__init__.py
similarity index 100%
rename from tests/functional/__init__.py
rename to legacy/utils/__init__.py

diff --git a/qtip/utils/ansible_api.py b/legacy/utils/ansible_api.py
similarity index 100%
rename from qtip/utils/ansible_api.py
rename to legacy/utils/ansible_api.py

diff --git a/qtip/utils/args_handler.py b/legacy/utils/args_handler.py
similarity index 100%
rename from qtip/utils/args_handler.py
rename to legacy/utils/args_handler.py

diff --git a/qtip/utils/cli.py b/legacy/utils/cli.py
similarity index 100%
rename from qtip/utils/cli.py
rename to legacy/utils/cli.py

diff --git a/qtip/utils/create_zones.py b/legacy/utils/create_zones.py
similarity index 100%
rename from qtip/utils/create_zones.py
rename to legacy/utils/create_zones.py

diff --git a/tests/unit/api/__init__.py b/legacy/utils/dashboard/__init__.py
similarity index 100%
rename from tests/unit/api/__init__.py
rename to legacy/utils/dashboard/__init__.py

diff --git a/qtip/utils/dashboard/pushtoDB.py b/legacy/utils/dashboard/pushtoDB.py
similarity index 100%
rename from qtip/utils/dashboard/pushtoDB.py
rename to legacy/utils/dashboard/pushtoDB.py

diff --git a/qtip/utils/driver.py b/legacy/utils/driver.py
similarity index 100%
rename from qtip/utils/driver.py
rename to legacy/utils/driver.py

diff --git a/qtip/utils/env_setup.py b/legacy/utils/env_setup.py
similarity index 100%
rename from qtip/utils/env_setup.py
rename to legacy/utils/env_setup.py

diff --git a/tests/unit/utils/__init__.py b/legacy/utils/report/__init__.py
similarity index 100%
rename from tests/unit/utils/__init__.py
rename to legacy/utils/report/__init__.py

diff --git a/qtip/utils/report/get_indices.py b/legacy/utils/report/get_indices.py
similarity index 100%
rename from qtip/utils/report/get_indices.py
rename to legacy/utils/report/get_indices.py

diff --git a/qtip/utils/report/get_results.py b/legacy/utils/report/get_results.py
similarity index 100%
rename from qtip/utils/report/get_results.py
rename to legacy/utils/report/get_results.py

diff --git a/qtip/utils/report/qtip_graph.py b/legacy/utils/report/qtip_graph.py
similarity index 100%
rename from qtip/utils/report/qtip_graph.py
rename to legacy/utils/report/qtip_graph.py

diff --git a/qtip/utils/report/qtip_report.py b/legacy/utils/report/qtip_report.py
similarity index 100%
rename from qtip/utils/report/qtip_report.py
rename to legacy/utils/report/qtip_report.py

diff --git a/qtip/utils/spawn_vm.py b/legacy/utils/spawn_vm.py
similarity index 100%
rename from qtip/utils/spawn_vm.py
rename to legacy/utils/spawn_vm.py

diff --git a/legacy/utils/transform/__init__.py b/legacy/utils/transform/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qtip/utils/transform/dpi_transform.py b/legacy/utils/transform/dpi_transform.py
similarity index 100%
rename from qtip/utils/transform/dpi_transform.py
rename to legacy/utils/transform/dpi_transform.py

diff --git a/qtip/utils/transform/final_report.py b/legacy/utils/transform/final_report.py
similarity index 100%
rename from qtip/utils/transform/final_report.py
rename to legacy/utils/transform/final_report.py

diff --git a/qtip/utils/transform/fio_transform.py b/legacy/utils/transform/fio_transform.py
similarity index 100%
rename from qtip/utils/transform/fio_transform.py
rename to legacy/utils/transform/fio_transform.py

diff --git a/qtip/utils/transform/iperf_transform.py b/legacy/utils/transform/iperf_transform.py
similarity index 100%
rename from qtip/utils/transform/iperf_transform.py
rename to legacy/utils/transform/iperf_transform.py

diff --git a/qtip/utils/transform/ramspeed_transform.py b/legacy/utils/transform/ramspeed_transform.py
similarity index 100%
rename from qtip/utils/transform/ramspeed_transform.py
rename to legacy/utils/transform/ramspeed_transform.py

diff --git a/qtip/utils/transform/ssl_transform.py b/legacy/utils/transform/ssl_transform.py
similarity index 100%
rename from qtip/utils/transform/ssl_transform.py
rename to legacy/utils/transform/ssl_transform.py

diff --git a/qtip/utils/transform/ubench_transform.py b/legacy/utils/transform/ubench_transform.py
similarity index 100%
rename from qtip/utils/transform/ubench_transform.py
rename to legacy/utils/transform/ubench_transform.py

diff --git a/opt/servers/ansible.cfg b/opt/infra/ansible.cfg
similarity index 100%
rename from opt/servers/ansible.cfg
rename to opt/infra/ansible.cfg

diff --git a/opt/servers/inventory b/opt/infra/inventory
similarity index 100%
rename from opt/servers/inventory
rename to opt/infra/inventory

diff --git a/opt/servers/roles/docker/handlers/main.yml b/opt/infra/roles/docker/handlers/main.yml
similarity index 100%
rename from opt/servers/roles/docker/handlers/main.yml
rename to opt/infra/roles/docker/handlers/main.yml

diff --git a/opt/servers/roles/docker/tasks/main.yml b/opt/infra/roles/docker/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/docker/tasks/main.yml
rename to opt/infra/roles/docker/tasks/main.yml

diff --git a/opt/servers/roles/elk/tasks/main.yml b/opt/infra/roles/elk/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/elk/tasks/main.yml
rename to opt/infra/roles/elk/tasks/main.yml

diff --git a/opt/servers/roles/mongo/tasks/main.yml b/opt/infra/roles/mongo/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/mongo/tasks/main.yml
rename to opt/infra/roles/mongo/tasks/main.yml

diff --git a/opt/servers/roles/nginx/defaults/main.yml b/opt/infra/roles/nginx/defaults/main.yml
similarity index 100%
rename from opt/servers/roles/nginx/defaults/main.yml
rename to opt/infra/roles/nginx/defaults/main.yml

diff --git a/opt/servers/roles/nginx/handlers/main.yml b/opt/infra/roles/nginx/handlers/main.yml
similarity index 100%
rename from opt/servers/roles/nginx/handlers/main.yml
rename to opt/infra/roles/nginx/handlers/main.yml

diff --git a/opt/servers/roles/nginx/tasks/main.yml b/opt/infra/roles/nginx/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/nginx/tasks/main.yml
rename to opt/infra/roles/nginx/tasks/main.yml

diff --git a/opt/servers/roles/nginx/templates/elk.conf.j2 b/opt/infra/roles/nginx/templates/elk.conf.j2
similarity index 100%
rename from opt/servers/roles/nginx/templates/elk.conf.j2
rename to opt/infra/roles/nginx/templates/elk.conf.j2

diff --git a/opt/servers/roles/nginx/templates/qtip.conf.j2 b/opt/infra/roles/nginx/templates/qtip.conf.j2
similarity index 100%
rename from opt/servers/roles/nginx/templates/qtip.conf.j2
rename to opt/infra/roles/nginx/templates/qtip.conf.j2

diff --git a/opt/servers/roles/nginx/templates/testapi.conf.j2 b/opt/infra/roles/nginx/templates/testapi.conf.j2
similarity index 100%
rename from opt/servers/roles/nginx/templates/testapi.conf.j2
rename to opt/infra/roles/nginx/templates/testapi.conf.j2

diff --git a/opt/servers/roles/qtip/files/run_qtip_server.sh b/opt/infra/roles/qtip/files/run_qtip_server.sh
similarity index 100%
rename from opt/servers/roles/qtip/files/run_qtip_server.sh
rename to opt/infra/roles/qtip/files/run_qtip_server.sh

diff --git a/opt/servers/roles/qtip/tasks/main.yml b/opt/infra/roles/qtip/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/qtip/tasks/main.yml
rename to opt/infra/roles/qtip/tasks/main.yml

diff --git a/opt/servers/roles/testapi/files/run_testapi.sh b/opt/infra/roles/testapi/files/run_testapi.sh
similarity index 100%
rename from opt/servers/roles/testapi/files/run_testapi.sh
rename to opt/infra/roles/testapi/files/run_testapi.sh

diff --git a/opt/servers/roles/testapi/tasks/main.yml b/opt/infra/roles/testapi/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/testapi/tasks/main.yml
rename to opt/infra/roles/testapi/tasks/main.yml

diff --git a/opt/servers/roles/user/defaults/main.yml b/opt/infra/roles/user/defaults/main.yml
similarity index 100%
rename from opt/servers/roles/user/defaults/main.yml
rename to opt/infra/roles/user/defaults/main.yml

diff --git a/opt/servers/roles/user/files/akhil.authorized_keys b/opt/infra/roles/user/files/akhil.authorized_keys
similarity index 100%
rename from opt/servers/roles/user/files/akhil.authorized_keys
rename to opt/infra/roles/user/files/akhil.authorized_keys

diff --git a/opt/servers/roles/user/files/serena.authorized_keys b/opt/infra/roles/user/files/serena.authorized_keys
similarity index 100%
rename from opt/servers/roles/user/files/serena.authorized_keys
rename to opt/infra/roles/user/files/serena.authorized_keys

diff --git a/opt/servers/roles/user/files/sudoers.d-qtip b/opt/infra/roles/user/files/sudoers.d-qtip
similarity index 100%
rename from opt/servers/roles/user/files/sudoers.d-qtip
rename to opt/infra/roles/user/files/sudoers.d-qtip

diff --git a/opt/servers/roles/user/files/taseer.authorized_keys b/opt/infra/roles/user/files/taseer.authorized_keys
similarity index 100%
rename from opt/servers/roles/user/files/taseer.authorized_keys
rename to opt/infra/roles/user/files/taseer.authorized_keys

diff --git a/opt/servers/roles/user/files/yujunz.authorized_keys b/opt/infra/roles/user/files/yujunz.authorized_keys
similarity index 100%
rename from opt/servers/roles/user/files/yujunz.authorized_keys
rename to opt/infra/roles/user/files/yujunz.authorized_keys

diff --git a/opt/servers/roles/user/files/zhifeng.authorized_keys b/opt/infra/roles/user/files/zhifeng.authorized_keys
similarity index 100%
rename from opt/servers/roles/user/files/zhifeng.authorized_keys
rename to opt/infra/roles/user/files/zhifeng.authorized_keys

diff --git a/opt/servers/roles/user/tasks/main.yml b/opt/infra/roles/user/tasks/main.yml
similarity index 100%
rename from opt/servers/roles/user/tasks/main.yml
rename to opt/infra/roles/user/tasks/main.yml

diff --git a/opt/servers/test.yml b/opt/infra/test.yml
similarity index 100%
rename from opt/servers/test.yml
rename to opt/infra/test.yml

diff --git a/qtip/api/cmd/server.py b/qtip/api/cmd/server.py
index 3b89af1..eea45ad 100644 (file)
--- a/qtip/api/cmd/server.py
+++ b/qtip/api/cmd/server.py
@@ -10,7 +10,8 @@
 from flask import Flask
 from flask_restful import Api
 from flask_restful_swagger import swagger
-import qtip.api.router.mapper as mapper
+
+import legacy.api.router.mapper as mapper
 
 app = Flask(__name__)
 api = swagger.docs(Api(app), apiVersion='0.1', description='QTIP API specs')

diff --git a/qtip/loader/qpi.py b/qtip/loader/qpi.py
index cfa918c..fe2323d 100644 (file)
--- a/qtip/loader/qpi.py
+++ b/qtip/loader/qpi.py
@@ -11,7 +11,7 @@ from base import BaseLoader
 from metric import MetricSpec
 
 from qtip.base.constant import PropName
-from qtip.utils.formula import Formula
+from qtip.util.formula import Formula
 
 
 class QPISpec(BaseLoader):

diff --git a/qtip/util/__init__.py b/qtip/util/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/qtip/utils/formula.py b/qtip/util/formula.py
similarity index 100%
rename from qtip/utils/formula.py
rename to qtip/util/formula.py

diff --git a/qtip/utils/logger_utils.py b/qtip/util/logger.py
similarity index 100%
rename from qtip/utils/logger_utils.py
rename to qtip/util/logger.py

diff --git a/setup.cfg b/setup.cfg
index 790a365..ced6d22 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,4 +20,7 @@ console_scripts =
 packages =
     qtip
 data_files =
-    etc/qtip = benchmarks/*
+    opt/qtip = opt/*
+
+[tool:pytest]
+addopts = --ignore=legacy

diff --git a/tox.ini b/tox.ini
index 7d17af6..56a8afe 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -32,4 +32,4 @@ commands = flake8 {toxinidir}
 show-source = True
 ignore = E123,E125,H803,E501
 builtins = _
-exclude = build,dist,doc,.eggs,.git,.tox,.venv
+exclude = build,dist,doc,legacy,.eggs,.git,.tox,.venv