From: wu.zhihui Date: Wed, 12 Oct 2016 07:32:52 +0000 (+0800) Subject: Adjust directory structure X-Git-Tag: danube.1.0~250^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eddc35b497362c0c01e612d66ed19c4d5c9dd328;p=qtip.git Adjust directory structure qtip ! +---- scripts ! ! ! +----ref_result # python scripts to generate results report ! +----fetch_compute_ips.sh ! +----fetch_os_creds.sh ! +----file_permission.sh ! +----get_env_info.sh ! +----qtip_creds.sh ! +----ssh_exch.exp ! +---- config ! ! ! +---- Qtip_key ! +---- Qtip_key.pub ! +---- SampleHeat.yaml ! +---- utils ! ! ! +---- logger_utils.py ! +---- report # generate pdf report file Change-Id: Ia908ff31494369c1a13fb88b1ff9b0e5681f8e29 Signed-off-by: wu.zhihui --- diff --git a/data/QtipKey b/config/QtipKey similarity index 100% rename from data/QtipKey rename to config/QtipKey diff --git a/data/QtipKey.pub b/config/QtipKey.pub similarity index 100% rename from data/QtipKey.pub rename to config/QtipKey.pub diff --git a/heat/SampleHeat.yaml b/config/SampleHeat.yaml similarity index 100% rename from heat/SampleHeat.yaml rename to config/SampleHeat.yaml diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh index d766d46c..62f97c88 100755 --- a/docker/run_qtip.sh +++ b/docker/run_qtip.sh @@ -3,21 +3,21 @@ run_test_suite() { if [ "$TEST_CASE" == "compute" ]; then cd ${QTIP_DIR} && python qtip.py -l default -f compute - cd ${QTIP_DIR} && python data/ref_results/suite_result.py compute + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py compute elif [ "$TEST_CASE" == "storage" ]; then cd ${QTIP_DIR} && python qtip.py -l default -f storage - cd ${QTIP_DIR} && python data/ref_results/suite_result.py storage + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py storage elif [ "$TEST_CASE" == "network" ]; then cd ${QTIP_DIR} && python qtip.py -l default -f network - cd ${QTIP_DIR} && python data/ref_results/suite_result.py network + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py network elif [ "$TEST_CASE" == "all" ]; then cd ${QTIP_DIR} && python qtip.py -l default -f compute cd ${QTIP_DIR} && python qtip.py -l default -f storage cd ${QTIP_DIR} && python qtip.py -l default -f network - cd ${QTIP_DIR} && python data/ref_results/suite_result.py compute - cd ${QTIP_DIR} && python data/ref_results/suite_result.py storage - cd ${QTIP_DIR} && python data/ref_results/suite_result.py network + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py compute + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py storage + cd ${QTIP_DIR} && python scripts/ref_results/suite_result.py network fi } diff --git a/func/driver.py b/func/driver.py index bcda0ce1..9a011c2a 100644 --- a/func/driver.py +++ b/func/driver.py @@ -64,9 +64,9 @@ class Driver: def run_ansible_playbook(self, benchmark, extra_vars): logger.info(extra_vars) ansible_api = AnsibleApi() - ansible_api.execute_playbook('./data/hosts', + ansible_api.execute_playbook('./config/hosts', './benchmarks/playbooks/{0}.yaml'.format(benchmark), - './data/QtipKey', extra_vars) + './config/QtipKey', extra_vars) return self.get_ansible_result(extra_vars['role'], ansible_api.get_detail_playbook_stats()) def drive_bench(self, installer_type, pwd, benchmark, roles, benchmark_fname, diff --git a/func/env_setup.py b/func/env_setup.py index 2655fab9..9e21a5b6 100644 --- a/func/env_setup.py +++ b/func/env_setup.py @@ -46,7 +46,7 @@ class Env_setup: @staticmethod def write_to_file(role): - f_name_2 = open('./data/hosts', 'w') + f_name_2 = open('./config/hosts', 'w') print role.items() for k in role: f_name_2.write('[' + k + ']\n') @@ -62,13 +62,13 @@ class Env_setup: os.system('ssh-keyscan %s >> /root/.ssh/known_hosts' % ip) time.sleep(2) - ssh_cmd = './data/qtip_creds.sh %s' % ip + ssh_cmd = './scripts/qtip_creds.sh %s' % ip logger.info("run command: %s " % ssh_cmd) os.system(ssh_cmd) ssh = paramiko.SSHClient() ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - ssh.connect(ip, key_filename='./data/QtipKey') + ssh.connect(ip, key_filename='./config/QtipKey') for attempts in range(100): try: @@ -109,7 +109,7 @@ class Env_setup: if not installer_ip: raise RuntimeError("undefine environment variable INSTALLER_IP") - cmd = "bash ./data/fetch_compute_ips.sh -i %s -a %s" % \ + cmd = "bash ./scripts/fetch_compute_ips.sh -i %s -a %s" % \ (installer_type, installer_ip) logger.info(cmd) os.system(cmd) diff --git a/func/spawn_vm.py b/func/spawn_vm.py index c45af00e..3a16e02d 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -65,15 +65,15 @@ class SpawnVM(Env_setup): def heat_template_vm(self, vm_params, installer): Heat_Dic = {} try: - with open('./heat/SampleHeat.yaml', 'r+') as H_temp: + with open('./config/SampleHeat.yaml', 'r+') as H_temp: Heat_Dic = yaml.safe_load(H_temp) except yaml.YAMLError as exc: if hasattr(exc, 'problem_mark'): mark = exc.problem_mark - print 'Error in qtip/heat/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1) + print 'Error in qtip/config/SampleHeat.yaml at: (%s,%s)' % (mark.line + 1, mark.column + 1) print 'EXITING PROGRAM. Correct File and restart' sys.exit(1) - fopen = open('./data/QtipKey.pub', 'r') + fopen = open('./config/QtipKey.pub', 'r') fopenstr = fopen.read() fopenstr = fopenstr.rstrip() scriptcmd = '#!/bin/bash \n echo {0} >> foo.txt \n echo {1} >> /root/.ssh/authorized_keys'.format( @@ -243,7 +243,7 @@ class SpawnVM(Env_setup): if i['output_key'] == 'KeyPair_PublicKey': sshkey = str(i['output_value']) - with open('./data/my_key.pem', 'w') as fopen: + with open('./config/my_key.pem', 'w') as fopen: fopen.write(sshkey) fopen.close() print Env_setup.ip_pw_list diff --git a/data/fetch_compute_ips.sh b/scripts/fetch_compute_ips.sh similarity index 100% rename from data/fetch_compute_ips.sh rename to scripts/fetch_compute_ips.sh diff --git a/data/fetch_os_creds.sh b/scripts/fetch_os_creds.sh similarity index 100% rename from data/fetch_os_creds.sh rename to scripts/fetch_os_creds.sh diff --git a/data/file_permission.sh b/scripts/file_permission.sh similarity index 100% rename from data/file_permission.sh rename to scripts/file_permission.sh diff --git a/get_env_info.sh b/scripts/get_env_info.sh similarity index 92% rename from get_env_info.sh rename to scripts/get_env_info.sh index 2fb0d22b..4b362fac 100755 --- a/get_env_info.sh +++ b/scripts/get_env_info.sh @@ -34,4 +34,4 @@ if [ $INSTALLER_TYPE == "apex" ] fi -./data/fetch_os_creds.sh -d ./opnfv-creds.sh +./scripts/fetch_os_creds.sh -d ./opnfv-creds.sh diff --git a/data/qtip_creds.sh b/scripts/qtip_creds.sh similarity index 100% rename from data/qtip_creds.sh rename to scripts/qtip_creds.sh diff --git a/data/__init__.py b/scripts/ref_results/__init__.py similarity index 100% rename from data/__init__.py rename to scripts/ref_results/__init__.py diff --git a/data/ref_results/compute_benchmarks_indices.py b/scripts/ref_results/compute_benchmarks_indices.py similarity index 100% rename from data/ref_results/compute_benchmarks_indices.py rename to scripts/ref_results/compute_benchmarks_indices.py diff --git a/data/ref_results/generator_ref_json.py b/scripts/ref_results/generator_ref_json.py similarity index 100% rename from data/ref_results/generator_ref_json.py rename to scripts/ref_results/generator_ref_json.py diff --git a/data/ref_results/index_calculation.py b/scripts/ref_results/index_calculation.py similarity index 100% rename from data/ref_results/index_calculation.py rename to scripts/ref_results/index_calculation.py diff --git a/data/ref_results/network_benchmarks_indices.py b/scripts/ref_results/network_benchmarks_indices.py similarity index 100% rename from data/ref_results/network_benchmarks_indices.py rename to scripts/ref_results/network_benchmarks_indices.py diff --git a/data/ref_results/reference.json b/scripts/ref_results/reference.json similarity index 100% rename from data/ref_results/reference.json rename to scripts/ref_results/reference.json diff --git a/data/ref_results/result_accum.py b/scripts/ref_results/result_accum.py similarity index 100% rename from data/ref_results/result_accum.py rename to scripts/ref_results/result_accum.py diff --git a/data/ref_results/storage_benchmarks_indices.py b/scripts/ref_results/storage_benchmarks_indices.py similarity index 100% rename from data/ref_results/storage_benchmarks_indices.py rename to scripts/ref_results/storage_benchmarks_indices.py diff --git a/data/ref_results/suite_result.py b/scripts/ref_results/suite_result.py similarity index 100% rename from data/ref_results/suite_result.py rename to scripts/ref_results/suite_result.py diff --git a/data/ssh_exch.exp b/scripts/ssh_exch.exp similarity index 100% rename from data/ssh_exch.exp rename to scripts/ssh_exch.exp diff --git a/setup.py b/setup.py index 52874dd3..85dc966b 100644 --- a/setup.py +++ b/setup.py @@ -7,4 +7,4 @@ setup(name='qtip', py_modules=['qtip'], version='1.0', author='opnfv', - packages=['func', 'data.ref_results', 'data.report']) + packages=['func', 'scripts.ref_results', 'utils.report']) diff --git a/tests/ansible_api_test.py b/tests/ansible_api_test.py index e9f0a77d..613d5f7e 100644 --- a/tests/ansible_api_test.py +++ b/tests/ansible_api_test.py @@ -14,6 +14,6 @@ class TestClass: ansible_api = AnsibleApi() ret = ansible_api.execute_playbook('tests/data/hosts', 'tests/data/test.yml', - 'data/QtipKey', + 'config/QtipKey', {'keys': 'test'}) assert ret == 3 diff --git a/tests/env_setup_test.py b/tests/env_setup_test.py index cc3c6b60..a0bbf640 100644 --- a/tests/env_setup_test.py +++ b/tests/env_setup_test.py @@ -64,7 +64,7 @@ class TestClass: test_class.fetch_compute_ips = mock_ips test_class.parse("tests/test_case/bm_without_proxy.yaml") test_class.update_ansible() - result = filecmp.cmp('tests/output/hosts', 'data/hosts') + result = filecmp.cmp('tests/output/hosts', 'config/hosts') assert result def test_ping(self, capfd): diff --git a/data/report/Qtip_Report.py b/utils/report/Qtip_Report.py similarity index 100% rename from data/report/Qtip_Report.py rename to utils/report/Qtip_Report.py diff --git a/data/ref_results/__init__.py b/utils/report/__init__.py similarity index 100% rename from data/ref_results/__init__.py rename to utils/report/__init__.py diff --git a/data/report/get_indices.py b/utils/report/get_indices.py similarity index 100% rename from data/report/get_indices.py rename to utils/report/get_indices.py diff --git a/data/report/get_results.py b/utils/report/get_results.py similarity index 100% rename from data/report/get_results.py rename to utils/report/get_results.py diff --git a/data/report/qtip_graph.py b/utils/report/qtip_graph.py similarity index 100% rename from data/report/qtip_graph.py rename to utils/report/qtip_graph.py