147 files changed, 41 insertions, 8 deletions
diff --git a/legacy/DO-NOT-DELETE b/legacy/DO-NOT-DELETE
new file mode 100644
index 00000000..fdecaad1
--- /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
index e69de29b..e69de29b 100644
--- a/qtip/agent/__init__.py
+++ b/legacy/__init__.py
diff --git a/qtip/api/handler/__init__.py b/legacy/api/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/api/handler/__init__.py
+++ b/legacy/api/__init__.py
diff --git a/qtip/api/model/__init__.py b/legacy/api/handler/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/api/model/__init__.py
+++ b/legacy/api/handler/__init__.py
diff --git a/qtip/api/handler/db.py b/legacy/api/handler/db.py
index 24fc27a5..24fc27a5 100644
--- a/qtip/api/handler/db.py
+++ b/legacy/api/handler/db.py
diff --git a/qtip/api/handler/job_handler.py b/legacy/api/handler/job_handler.py
index eade9df7..b75da5ff 100644
--- 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
index 3d1d592e..3d1d592e 100644
--- a/qtip/api/handler/result_handler.py
+++ b/legacy/api/handler/result_handler.py
diff --git a/qtip/api/router/__init__.py b/legacy/api/model/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/api/router/__init__.py
+++ b/legacy/api/model/__init__.py
diff --git a/qtip/api/model/job_model.py b/legacy/api/model/job_model.py
index f7eb9fda..f7eb9fda 100644
--- a/qtip/api/model/job_model.py
+++ b/legacy/api/model/job_model.py
diff --git a/qtip/utils/__init__.py b/legacy/api/router/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/utils/__init__.py
+++ b/legacy/api/router/__init__.py
diff --git a/qtip/api/router/mapper.py b/legacy/api/router/mapper.py
index a5f029ac..8839f3f5 100644
--- 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
index 5cb6f450..5cb6f450 100644
--- a/benchmarks/perftest/common/git_proxy_pbook.yaml
+++ b/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
index 5c2d8f79..5c2d8f79 100644
--- a/benchmarks/perftest/common/sys_info_pbook.yaml
+++ b/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
index bf4a8ccb..bf4a8ccb 100644
--- a/benchmarks/perftest/common/sys_proxy_pbook.yaml
+++ b/legacy/assets/perftest/common/sys_proxy_pbook.yaml
diff --git a/benchmarks/perftest/dhrystone.yaml b/legacy/assets/perftest/dhrystone.yaml
index 896aadfc..896aadfc 100644
--- a/benchmarks/perftest/dhrystone.yaml
+++ b/legacy/assets/perftest/dhrystone.yaml
diff --git a/benchmarks/perftest/dpi.yaml b/legacy/assets/perftest/dpi.yaml
index 2a10bef6..2a10bef6 100644
--- a/benchmarks/perftest/dpi.yaml
+++ b/legacy/assets/perftest/dpi.yaml
diff --git a/benchmarks/perftest/etc/dpi_average.sh b/legacy/assets/perftest/etc/dpi_average.sh
index 405d3ff6..405d3ff6 100644
--- a/benchmarks/perftest/etc/dpi_average.sh
+++ b/legacy/assets/perftest/etc/dpi_average.sh
diff --git a/benchmarks/perftest/etc/fio_test_job b/legacy/assets/perftest/etc/fio_test_job
index 6817abca..6817abca 100644
--- a/benchmarks/perftest/etc/fio_test_job
+++ b/legacy/assets/perftest/etc/fio_test_job
diff --git a/benchmarks/perftest/etc/info_collect.py b/legacy/assets/perftest/etc/info_collect.py
index 3fc35d5a..3fc35d5a 100644
--- a/benchmarks/perftest/etc/info_collect.py
+++ b/legacy/assets/perftest/etc/info_collect.py
diff --git a/benchmarks/perftest/fio.yaml b/legacy/assets/perftest/fio.yaml
index 0da9407d..0da9407d 100644
--- a/benchmarks/perftest/fio.yaml
+++ b/legacy/assets/perftest/fio.yaml
diff --git a/benchmarks/perftest/iperf.yaml b/legacy/assets/perftest/iperf.yaml
index a1755f7c..a1755f7c 100644
--- a/benchmarks/perftest/iperf.yaml
+++ b/legacy/assets/perftest/iperf.yaml
diff --git a/benchmarks/perftest/ramspeed.yaml b/legacy/assets/perftest/ramspeed.yaml
index 83ecd8bf..83ecd8bf 100644
--- a/benchmarks/perftest/ramspeed.yaml
+++ b/legacy/assets/perftest/ramspeed.yaml
diff --git a/benchmarks/perftest/ssl.yaml b/legacy/assets/perftest/ssl.yaml
index 6002bfff..6002bfff 100644
--- a/benchmarks/perftest/ssl.yaml
+++ b/legacy/assets/perftest/ssl.yaml
diff --git a/benchmarks/perftest/summary b/legacy/assets/perftest/summary
index 5891408c..5891408c 100644
--- a/benchmarks/perftest/summary
+++ b/legacy/assets/perftest/summary
diff --git a/benchmarks/perftest/whetstone.yaml b/legacy/assets/perftest/whetstone.yaml
index d6eae85f..d6eae85f 100644
--- a/benchmarks/perftest/whetstone.yaml
+++ b/legacy/assets/perftest/whetstone.yaml
diff --git a/benchmarks/suite/compute b/legacy/assets/suite/compute
index 3bf1b184..3bf1b184 100644
--- a/benchmarks/suite/compute
+++ b/legacy/assets/suite/compute
diff --git a/benchmarks/suite/compute.yaml b/legacy/assets/suite/compute.yaml
index 197d5720..197d5720 100644
--- a/benchmarks/suite/compute.yaml
+++ b/legacy/assets/suite/compute.yaml
diff --git a/benchmarks/suite/network b/legacy/assets/suite/network
index 58ce5cb9..58ce5cb9 100644
--- a/benchmarks/suite/network
+++ b/legacy/assets/suite/network
diff --git a/benchmarks/suite/storage b/legacy/assets/suite/storage
index f3068dd5..f3068dd5 100644
--- a/benchmarks/suite/storage
+++ b/legacy/assets/suite/storage
diff --git a/benchmarks/testplan/default/compute/dhrystone_bm.yaml b/legacy/assets/testplan/default/compute/dhrystone_bm.yaml
index 64741537..64741537 100644
--- a/benchmarks/testplan/default/compute/dhrystone_bm.yaml
+++ b/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
index 8f5a4165..8f5a4165 100644
--- a/benchmarks/testplan/default/compute/dhrystone_vm.yaml
+++ b/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
index 14cb6d0d..14cb6d0d 100644
--- a/benchmarks/testplan/default/compute/dpi_bm.yaml
+++ b/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
index 10e86993..10e86993 100644
--- a/benchmarks/testplan/default/compute/dpi_vm.yaml
+++ b/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
index ed8fc700..ed8fc700 100644
--- a/benchmarks/testplan/default/compute/ramspeed_bm.yaml
+++ b/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
index a6a4363f..a6a4363f 100644
--- a/benchmarks/testplan/default/compute/ramspeed_vm.yaml
+++ b/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
index cc5a8903..cc5a8903 100644
--- a/benchmarks/testplan/default/compute/ssl_bm.yaml
+++ b/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
index 37824896..37824896 100644
--- a/benchmarks/testplan/default/compute/ssl_vm.yaml
+++ b/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
index 3c128b60..3c128b60 100644
--- a/benchmarks/testplan/default/compute/whetstone_bm.yaml
+++ b/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
index 0f1e8748..0f1e8748 100644
--- a/benchmarks/testplan/default/compute/whetstone_vm.yaml
+++ b/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
index 3aa8310d..3aa8310d 100644
--- a/benchmarks/testplan/default/network/iperf_bm.yaml
+++ b/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
index 49bf13ad..49bf13ad 100644
--- a/benchmarks/testplan/default/network/iperf_vm.yaml
+++ b/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
index c5b94715..c5b94715 100644
--- a/benchmarks/testplan/default/network/iperf_vm_2.yaml
+++ b/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
index d0001ea2..d0001ea2 100644
--- a/benchmarks/testplan/default/storage/fio_bm.yaml
+++ b/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
index 0e7f121b..0e7f121b 100644
--- a/benchmarks/testplan/default/storage/fio_vm.yaml
+++ b/legacy/assets/testplan/default/storage/fio_vm.yaml
diff --git a/config/SampleHeat.yaml b/legacy/config/SampleHeat.yaml
index a42cdb79..a42cdb79 100644
--- a/config/SampleHeat.yaml
+++ b/legacy/config/SampleHeat.yaml
diff --git a/tests/data/hosts b/legacy/data/hosts
index 0a0ac539..0a0ac539 100644
--- a/tests/data/hosts
+++ b/legacy/data/hosts
diff --git a/legacy/data/my_key.pem b/legacy/data/my_key.pem
new file mode 100644
index 00000000..d7c96f24
--- /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
index 9b47df0e..9b47df0e 100644
--- a/tests/data/output/hosts
+++ b/legacy/data/output/hosts
diff --git a/tests/data/schema/test_bm_schema.yaml b/legacy/data/schema/test_bm_schema.yaml
index a7c27e3f..a7c27e3f 100644
--- a/tests/data/schema/test_bm_schema.yaml
+++ b/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
index 524f8fe4..524f8fe4 100644
--- a/tests/data/schema/test_vm_schema.yaml
+++ b/legacy/data/schema/test_vm_schema.yaml
diff --git a/tests/data/test.retry b/legacy/data/test.retry
index 7b9ad531..7b9ad531 100644
--- a/tests/data/test.retry
+++ b/legacy/data/test.retry
diff --git a/tests/data/test.yml b/legacy/data/test.yml
index 270e86fd..270e86fd 100644
--- a/tests/data/test.yml
+++ b/legacy/data/test.yml
diff --git a/tests/data/testplan/bm_ping.yaml b/legacy/data/testplan/bm_ping.yaml
index 41d696e2..41d696e2 100644
--- a/tests/data/testplan/bm_ping.yaml
+++ b/legacy/data/testplan/bm_ping.yaml
diff --git a/tests/data/testplan/bm_with_proxy.yaml b/legacy/data/testplan/bm_with_proxy.yaml
index 1d73300b..1d73300b 100644
--- a/tests/data/testplan/bm_with_proxy.yaml
+++ b/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
index a9ae3b71..a9ae3b71 100644
--- a/tests/data/testplan/bm_without_proxy.yaml
+++ b/legacy/data/testplan/bm_without_proxy.yaml
diff --git a/tests/data/testplan/vm.yaml b/legacy/data/testplan/vm.yaml
index 4c8453ca..4c8453ca 100644
--- a/tests/data/testplan/vm.yaml
+++ b/legacy/data/testplan/vm.yaml
diff --git a/tests/data/testplan/vm_error.yaml b/legacy/data/testplan/vm_error.yaml
index f13d3a00..f13d3a00 100644
--- a/tests/data/testplan/vm_error.yaml
+++ b/legacy/data/testplan/vm_error.yaml
diff --git a/docker/Dockerfile b/legacy/docker/Dockerfile
index 369fa6c8..369fa6c8 100644
--- a/docker/Dockerfile
+++ b/legacy/docker/Dockerfile
diff --git a/docker/README.md b/legacy/docker/README.md
index 35ac0935..35ac0935 100644
--- a/docker/README.md
+++ b/legacy/docker/README.md
diff --git a/docker/ansible.cfg.default b/legacy/docker/ansible.cfg.default
index 0451870a..0451870a 100644
--- a/docker/ansible.cfg.default
+++ b/legacy/docker/ansible.cfg.default
diff --git a/docker/cleanup_qtip_image.sh b/legacy/docker/cleanup_qtip_image.sh
index 9c2b59db..9c2b59db 100644
--- a/docker/cleanup_qtip_image.sh
+++ b/legacy/docker/cleanup_qtip_image.sh
diff --git a/docker/prepare_qtip_image.sh b/legacy/docker/prepare_qtip_image.sh
index 4095c806..4095c806 100644
--- a/docker/prepare_qtip_image.sh
+++ b/legacy/docker/prepare_qtip_image.sh
diff --git a/docker/push_db.sh b/legacy/docker/push_db.sh
index 50341eac..50341eac 100755
--- a/docker/push_db.sh
+++ b/legacy/docker/push_db.sh
diff --git a/docker/run_qtip.sh b/legacy/docker/run_qtip.sh
index 98abf139..98abf139 100755
--- a/docker/run_qtip.sh
+++ b/legacy/docker/run_qtip.sh
diff --git a/docker/supervisord.conf b/legacy/docker/supervisord.conf
index a6d457dd..a6d457dd 100644
--- a/docker/supervisord.conf
+++ b/legacy/docker/supervisord.conf
diff --git a/qtip/run.py b/legacy/run.py
index a2c26eda..a2c26eda 100644
--- a/qtip/run.py
+++ b/legacy/run.py
diff --git a/qtip/utils/dashboard/__init__.py b/legacy/scripts/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/utils/dashboard/__init__.py
+++ b/legacy/scripts/__init__.py
diff --git a/scripts/cleanup_creds.sh b/legacy/scripts/cleanup_creds.sh
index b4eee924..b4eee924 100755
--- a/scripts/cleanup_creds.sh
+++ b/legacy/scripts/cleanup_creds.sh
diff --git a/scripts/fetch_compute_ips.sh b/legacy/scripts/fetch_compute_ips.sh
index 4bdc9a48..4bdc9a48 100755
--- a/scripts/fetch_compute_ips.sh
+++ b/legacy/scripts/fetch_compute_ips.sh
diff --git a/scripts/get_env_info.sh b/legacy/scripts/get_env_info.sh
index cd49ac87..cd49ac87 100755
--- a/scripts/get_env_info.sh
+++ b/legacy/scripts/get_env_info.sh
diff --git a/scripts/qtip_creds.sh b/legacy/scripts/qtip_creds.sh
index af051ac5..af051ac5 100755
--- a/scripts/qtip_creds.sh
+++ b/legacy/scripts/qtip_creds.sh
diff --git a/qtip/utils/report/__init__.py b/legacy/scripts/ref_results/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/utils/report/__init__.py
+++ b/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
index 0b6eae36..0b6eae36 100644
--- a/scripts/ref_results/compute_benchmarks_indices.py
+++ b/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
index 95c3c4a6..95c3c4a6 100644
--- a/scripts/ref_results/index_calculation.py
+++ b/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
index c19d18eb..c19d18eb 100644
--- a/scripts/ref_results/network_benchmarks_indices.py
+++ b/legacy/scripts/ref_results/network_benchmarks_indices.py
diff --git a/scripts/ref_results/reference.json b/legacy/scripts/ref_results/reference.json
index cfcbfc3b..cfcbfc3b 100644
--- a/scripts/ref_results/reference.json
+++ b/legacy/scripts/ref_results/reference.json
diff --git a/scripts/ref_results/result_accum.py b/legacy/scripts/ref_results/result_accum.py
index 6cd55886..6cd55886 100644
--- a/scripts/ref_results/result_accum.py
+++ b/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
index a5aef638..a5aef638 100644
--- a/scripts/ref_results/storage_benchmarks_indices.py
+++ b/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
index 66213391..66213391 100644
--- a/scripts/ref_results/suite_result.py
+++ b/legacy/scripts/ref_results/suite_result.py
diff --git a/scripts/ssh_exch.exp b/legacy/scripts/ssh_exch.exp
index c52140b7..c52140b7 100644
--- a/scripts/ssh_exch.exp
+++ b/legacy/scripts/ssh_exch.exp
diff --git a/qtip/utils/transform/__init__.py b/legacy/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/qtip/utils/transform/__init__.py
+++ b/legacy/tests/__init__.py
diff --git a/tests/unit/utils/ansible_api_test.py b/legacy/tests/ansible_api_test.py
index 6f286fc3..6f286fc3 100644
--- a/tests/unit/utils/ansible_api_test.py
+++ b/legacy/tests/ansible_api_test.py
diff --git a/scripts/__init__.py b/legacy/tests/api/__init__.py
index e69de29b..e69de29b 100644
--- a/scripts/__init__.py
+++ b/legacy/tests/api/__init__.py
diff --git a/tests/unit/api/test_server.py b/legacy/tests/api/test_server.py
index e9364d3d..e9364d3d 100644
--- a/tests/unit/api/test_server.py
+++ b/legacy/tests/api/test_server.py
diff --git a/tests/unit/utils/args_handler_test.py b/legacy/tests/args_handler_test.py
index dceca1f5..dceca1f5 100644
--- a/tests/unit/utils/args_handler_test.py
+++ b/legacy/tests/args_handler_test.py
diff --git a/tests/unit/utils/cli_test.py b/legacy/tests/cli_test.py
index 0f3e4158..0f3e4158 100644
--- a/tests/unit/utils/cli_test.py
+++ b/legacy/tests/cli_test.py
diff --git a/tests/unit/utils/create_zones_test.py b/legacy/tests/create_zones_test.py
index dcfff5ec..dcfff5ec 100644
--- a/tests/unit/utils/create_zones_test.py
+++ b/legacy/tests/create_zones_test.py
diff --git a/tests/unit/utils/driver_test.py b/legacy/tests/driver_test.py
index 432ce1ae..432ce1ae 100644
--- a/tests/unit/utils/driver_test.py
+++ b/legacy/tests/driver_test.py
diff --git a/tests/unit/utils/env_setup_test.py b/legacy/tests/env_setup_test.py
index dea48190..dea48190 100644
--- a/tests/unit/utils/env_setup_test.py
+++ b/legacy/tests/env_setup_test.py
diff --git a/scripts/ref_results/__init__.py b/legacy/tests/functional/__init__.py
index e69de29b..e69de29b 100644
--- a/scripts/ref_results/__init__.py
+++ b/legacy/tests/functional/__init__.py
diff --git a/tests/functional/yaml_schema_test.py b/legacy/tests/functional/yaml_schema_test.py
index a975dca6..a975dca6 100644
--- a/tests/functional/yaml_schema_test.py
+++ b/legacy/tests/functional/yaml_schema_test.py
diff --git a/tests/unit/utils/spawn_vm_test.py b/legacy/tests/spawn_vm_test.py
index ba237378..ba237378 100644
--- a/tests/unit/utils/spawn_vm_test.py
+++ b/legacy/tests/spawn_vm_test.py
diff --git a/tests/functional/__init__.py b/legacy/utils/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/functional/__init__.py
+++ b/legacy/utils/__init__.py
diff --git a/qtip/utils/ansible_api.py b/legacy/utils/ansible_api.py
index 9e1d249e..9e1d249e 100644
--- a/qtip/utils/ansible_api.py
+++ b/legacy/utils/ansible_api.py
diff --git a/qtip/utils/args_handler.py b/legacy/utils/args_handler.py
index 993b1035..993b1035 100644
--- a/qtip/utils/args_handler.py
+++ b/legacy/utils/args_handler.py
diff --git a/qtip/utils/cli.py b/legacy/utils/cli.py
index 5e566f27..5e566f27 100644
--- a/qtip/utils/cli.py
+++ b/legacy/utils/cli.py
diff --git a/qtip/utils/create_zones.py b/legacy/utils/create_zones.py
index 5e378c83..5e378c83 100644
--- a/qtip/utils/create_zones.py
+++ b/legacy/utils/create_zones.py
diff --git a/tests/unit/api/__init__.py b/legacy/utils/dashboard/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/api/__init__.py
+++ b/legacy/utils/dashboard/__init__.py
diff --git a/qtip/utils/dashboard/pushtoDB.py b/legacy/utils/dashboard/pushtoDB.py
index 427d39c4..427d39c4 100644
--- a/qtip/utils/dashboard/pushtoDB.py
+++ b/legacy/utils/dashboard/pushtoDB.py
diff --git a/qtip/utils/driver.py b/legacy/utils/driver.py
index 9894e0f5..9894e0f5 100644
--- a/qtip/utils/driver.py
+++ b/legacy/utils/driver.py
diff --git a/qtip/utils/env_setup.py b/legacy/utils/env_setup.py
index 7bbedfcf..7bbedfcf 100644
--- a/qtip/utils/env_setup.py
+++ b/legacy/utils/env_setup.py
diff --git a/tests/unit/utils/__init__.py b/legacy/utils/report/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/unit/utils/__init__.py
+++ b/legacy/utils/report/__init__.py
diff --git a/qtip/utils/report/get_indices.py b/legacy/utils/report/get_indices.py
index 91219c0b..91219c0b 100644
--- a/qtip/utils/report/get_indices.py
+++ b/legacy/utils/report/get_indices.py
diff --git a/qtip/utils/report/get_results.py b/legacy/utils/report/get_results.py
index 23fd5383..23fd5383 100644
--- a/qtip/utils/report/get_results.py
+++ b/legacy/utils/report/get_results.py
diff --git a/qtip/utils/report/qtip_graph.py b/legacy/utils/report/qtip_graph.py
index acbda40c..acbda40c 100644
--- a/qtip/utils/report/qtip_graph.py
+++ b/legacy/utils/report/qtip_graph.py
diff --git a/qtip/utils/report/qtip_report.py b/legacy/utils/report/qtip_report.py
index 6809e892..6809e892 100644
--- a/qtip/utils/report/qtip_report.py
+++ b/legacy/utils/report/qtip_report.py
diff --git a/qtip/utils/spawn_vm.py b/legacy/utils/spawn_vm.py
index f38c9a3a..f38c9a3a 100644
--- a/qtip/utils/spawn_vm.py
+++ b/legacy/utils/spawn_vm.py
diff --git a/legacy/utils/transform/__init__.py b/legacy/utils/transform/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/legacy/utils/transform/__init__.py
diff --git a/qtip/utils/transform/dpi_transform.py b/legacy/utils/transform/dpi_transform.py
index ee29d8e2..ee29d8e2 100644
--- a/qtip/utils/transform/dpi_transform.py
+++ b/legacy/utils/transform/dpi_transform.py
diff --git a/qtip/utils/transform/final_report.py b/legacy/utils/transform/final_report.py
index 274742d4..274742d4 100644
--- a/qtip/utils/transform/final_report.py
+++ b/legacy/utils/transform/final_report.py
diff --git a/qtip/utils/transform/fio_transform.py b/legacy/utils/transform/fio_transform.py
index 5ecac823..5ecac823 100755
--- a/qtip/utils/transform/fio_transform.py
+++ b/legacy/utils/transform/fio_transform.py
diff --git a/qtip/utils/transform/iperf_transform.py b/legacy/utils/transform/iperf_transform.py
index b52e4634..b52e4634 100644
--- a/qtip/utils/transform/iperf_transform.py
+++ b/legacy/utils/transform/iperf_transform.py
diff --git a/qtip/utils/transform/ramspeed_transform.py b/legacy/utils/transform/ramspeed_transform.py
index 960f84fc..960f84fc 100644
--- a/qtip/utils/transform/ramspeed_transform.py
+++ b/legacy/utils/transform/ramspeed_transform.py
diff --git a/qtip/utils/transform/ssl_transform.py b/legacy/utils/transform/ssl_transform.py
index de84d24b..de84d24b 100644
--- a/qtip/utils/transform/ssl_transform.py
+++ b/legacy/utils/transform/ssl_transform.py
diff --git a/qtip/utils/transform/ubench_transform.py b/legacy/utils/transform/ubench_transform.py
index ab5fe171..ab5fe171 100644
--- a/qtip/utils/transform/ubench_transform.py
+++ b/legacy/utils/transform/ubench_transform.py
diff --git a/opt/servers/ansible.cfg b/opt/infra/ansible.cfg
index 93022c4e..93022c4e 100644
--- a/opt/servers/ansible.cfg
+++ b/opt/infra/ansible.cfg
diff --git a/opt/servers/inventory b/opt/infra/inventory
index 1ba1dc45..1ba1dc45 100644
--- a/opt/servers/inventory
+++ b/opt/infra/inventory
diff --git a/opt/servers/roles/docker/handlers/main.yml b/opt/infra/roles/docker/handlers/main.yml
index 985f8d41..985f8d41 100644
--- a/opt/servers/roles/docker/handlers/main.yml
+++ b/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
index 1cf3bea0..1cf3bea0 100644
--- a/opt/servers/roles/docker/tasks/main.yml
+++ b/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
index ed987f1a..ed987f1a 100644
--- a/opt/servers/roles/elk/tasks/main.yml
+++ b/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
index 81fb49b5..81fb49b5 100644
--- a/opt/servers/roles/mongo/tasks/main.yml
+++ b/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
index cdd1d773..cdd1d773 100644
--- a/opt/servers/roles/nginx/defaults/main.yml
+++ b/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
index 35585363..35585363 100644
--- a/opt/servers/roles/nginx/handlers/main.yml
+++ b/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
index 5c78166c..5c78166c 100644
--- a/opt/servers/roles/nginx/tasks/main.yml
+++ b/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
index 271690e0..271690e0 100644
--- a/opt/servers/roles/nginx/templates/elk.conf.j2
+++ b/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
index 3a15c6ba..3a15c6ba 100644
--- a/opt/servers/roles/nginx/templates/qtip.conf.j2
+++ b/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
index 6a4d388b..6a4d388b 100644
--- a/opt/servers/roles/nginx/templates/testapi.conf.j2
+++ b/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
index 0f5cafea..0f5cafea 100644
--- a/opt/servers/roles/qtip/files/run_qtip_server.sh
+++ b/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
index b8292791..b8292791 100644
--- a/opt/servers/roles/qtip/tasks/main.yml
+++ b/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
index f9ba8387..f9ba8387 100644
--- a/opt/servers/roles/testapi/files/run_testapi.sh
+++ b/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
index 8ca91396..8ca91396 100644
--- a/opt/servers/roles/testapi/tasks/main.yml
+++ b/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
index ef496dd4..ef496dd4 100644
--- a/opt/servers/roles/user/defaults/main.yml
+++ b/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
index 43942621..43942621 100644
--- a/opt/servers/roles/user/files/akhil.authorized_keys
+++ b/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
index 5cdbfe00..5cdbfe00 100644
--- a/opt/servers/roles/user/files/serena.authorized_keys
+++ b/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
index e96d278a..e96d278a 100644
--- a/opt/servers/roles/user/files/sudoers.d-qtip
+++ b/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
index 2efb95e8..2efb95e8 100644
--- a/opt/servers/roles/user/files/taseer.authorized_keys
+++ b/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
index 83ed540d..83ed540d 100644
--- a/opt/servers/roles/user/files/yujunz.authorized_keys
+++ b/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
index 195cfdca..195cfdca 100644
--- a/opt/servers/roles/user/files/zhifeng.authorized_keys
+++ b/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
index b1b5be9b..b1b5be9b 100644
--- a/opt/servers/roles/user/tasks/main.yml
+++ b/opt/infra/roles/user/tasks/main.yml
diff --git a/opt/servers/test.yml b/opt/infra/test.yml
index ee3ded13..ee3ded13 100644
--- a/opt/servers/test.yml
+++ b/opt/infra/test.yml
diff --git a/qtip/api/cmd/server.py b/qtip/api/cmd/server.py
index 3b89af1e..eea45ad3 100644
--- 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 cfa918c5..fe2323dd 100644
--- 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
index 00000000..e69de29b
--- /dev/null
+++ b/qtip/util/__init__.py
diff --git a/qtip/utils/formula.py b/qtip/util/formula.py
index cdfbae86..cdfbae86 100644
--- a/qtip/utils/formula.py
+++ b/qtip/util/formula.py
diff --git a/qtip/utils/logger_utils.py b/qtip/util/logger.py
index d5e76a64..d5e76a64 100644
--- a/qtip/utils/logger_utils.py
+++ b/qtip/util/logger.py
diff --git a/setup.cfg b/setup.cfg
index 790a365b..ced6d22e 100644
--- 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 7d17af65..56a8afe1 100644
--- 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