diff options
-rw-r--r-- | docs/testing/developer/design/apidocs/index.rst (renamed from docs/development/design/apidocs/index.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/design/apidocs/qtip_restful_api.rst (renamed from docs/development/design/apidocs/qtip_restful_api.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/design/compute_QPI.rst (renamed from docs/development/design/compute_QPI.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/design/dashboard.rst (renamed from docs/development/design/dashboard.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/design/index.rst (renamed from docs/development/design/index.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/design/integration_with_yardstick.rst (renamed from docs/development/design/integration_with_yardstick.rst) | 0 | ||||
-rw-r--r-- | docs/testing/developer/overview/.gitkeep (renamed from docs/development/overview/.gitkeep) | 0 | ||||
-rw-r--r-- | docs/testing/developer/requirement/.gitkeep (renamed from docs/development/requirement/.gitkeep) | 0 | ||||
-rw-r--r-- | docs/testing/user/.gitkeep (renamed from docs/release/installation/.gitkeep) | 0 | ||||
-rw-r--r-- | docs/testing/user/configguide/configuration.rst (renamed from docs/release/configguide/configuration.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/configguide/index.rst (renamed from docs/release/configguide/index.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/installation/.gitkeep (renamed from docs/release/scenarios/.gitkeep) | 0 | ||||
-rw-r--r-- | docs/testing/user/scenarios/.gitkeep (renamed from qtip/driver/ansible/__init__.py) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/_01-compute.rst (renamed from docs/release/userguide/_01-compute.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/_02-network.rst (renamed from docs/release/userguide/_02-network.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/_03-storage.rst (renamed from docs/release/userguide/_03-storage.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/_testcase_description.rst (renamed from docs/release/userguide/_testcase_description.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/annex.rst (renamed from docs/release/userguide/annex.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/benchmark-suites.rst (renamed from docs/release/userguide/benchmark-suites.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/index.rst (renamed from docs/release/userguide/index.rst) | 0 | ||||
-rw-r--r-- | docs/testing/user/userguide/introduction.rst (renamed from docs/release/userguide/introduction.rst) | 0 | ||||
-rw-r--r-- | qtip/api/__main__.py | 9 | ||||
-rw-r--r-- | qtip/api/swagger/swagger.yaml | 9 | ||||
-rw-r--r-- | qtip/driver/ansible.py (renamed from qtip/driver/ansible/ansible.py) | 0 | ||||
-rw-r--r-- | qtip/driver/playbook/bwn_ng.yaml (renamed from qtip/driver/ansible/playbook/bwn_ng.yaml) | 0 | ||||
-rw-r--r-- | qtip/driver/playbook/dhrystone/clean.yaml | 27 | ||||
-rw-r--r-- | qtip/driver/playbook/dhrystone/run.yaml | 63 | ||||
-rw-r--r-- | qtip/driver/playbook/dhrystone/setup.yaml | 66 | ||||
-rw-r--r-- | qtip/driver/playbook/inxi.yaml (renamed from qtip/driver/ansible/playbook/inxi.yaml) | 0 | ||||
-rw-r--r-- | qtip/driver/playbook/prepare_env.yaml (renamed from qtip/driver/ansible/playbook/prepare_env.yaml) | 14 | ||||
-rw-r--r-- | qtip/driver/playbook/top.yaml (renamed from qtip/driver/ansible/playbook/top.yaml) | 0 | ||||
-rw-r--r-- | tests/unit/util/logger_test.py | 9 |
32 files changed, 196 insertions, 1 deletions
diff --git a/docs/development/design/apidocs/index.rst b/docs/testing/developer/design/apidocs/index.rst index 241a2680..241a2680 100644 --- a/docs/development/design/apidocs/index.rst +++ b/docs/testing/developer/design/apidocs/index.rst diff --git a/docs/development/design/apidocs/qtip_restful_api.rst b/docs/testing/developer/design/apidocs/qtip_restful_api.rst index 06c01292..06c01292 100644 --- a/docs/development/design/apidocs/qtip_restful_api.rst +++ b/docs/testing/developer/design/apidocs/qtip_restful_api.rst diff --git a/docs/development/design/compute_QPI.rst b/docs/testing/developer/design/compute_QPI.rst index 2e5aa87c..2e5aa87c 100644 --- a/docs/development/design/compute_QPI.rst +++ b/docs/testing/developer/design/compute_QPI.rst diff --git a/docs/development/design/dashboard.rst b/docs/testing/developer/design/dashboard.rst index 60c4720d..60c4720d 100644 --- a/docs/development/design/dashboard.rst +++ b/docs/testing/developer/design/dashboard.rst diff --git a/docs/development/design/index.rst b/docs/testing/developer/design/index.rst index b6dd0c01..b6dd0c01 100644 --- a/docs/development/design/index.rst +++ b/docs/testing/developer/design/index.rst diff --git a/docs/development/design/integration_with_yardstick.rst b/docs/testing/developer/design/integration_with_yardstick.rst index a8298d6f..a8298d6f 100644 --- a/docs/development/design/integration_with_yardstick.rst +++ b/docs/testing/developer/design/integration_with_yardstick.rst diff --git a/docs/development/overview/.gitkeep b/docs/testing/developer/overview/.gitkeep index e69de29b..e69de29b 100644 --- a/docs/development/overview/.gitkeep +++ b/docs/testing/developer/overview/.gitkeep diff --git a/docs/development/requirement/.gitkeep b/docs/testing/developer/requirement/.gitkeep index e69de29b..e69de29b 100644 --- a/docs/development/requirement/.gitkeep +++ b/docs/testing/developer/requirement/.gitkeep diff --git a/docs/release/installation/.gitkeep b/docs/testing/user/.gitkeep index e69de29b..e69de29b 100644 --- a/docs/release/installation/.gitkeep +++ b/docs/testing/user/.gitkeep diff --git a/docs/release/configguide/configuration.rst b/docs/testing/user/configguide/configuration.rst index 78e96492..78e96492 100644 --- a/docs/release/configguide/configuration.rst +++ b/docs/testing/user/configguide/configuration.rst diff --git a/docs/release/configguide/index.rst b/docs/testing/user/configguide/index.rst index d5e05d63..d5e05d63 100644 --- a/docs/release/configguide/index.rst +++ b/docs/testing/user/configguide/index.rst diff --git a/docs/release/scenarios/.gitkeep b/docs/testing/user/installation/.gitkeep index e69de29b..e69de29b 100644 --- a/docs/release/scenarios/.gitkeep +++ b/docs/testing/user/installation/.gitkeep diff --git a/qtip/driver/ansible/__init__.py b/docs/testing/user/scenarios/.gitkeep index e69de29b..e69de29b 100644 --- a/qtip/driver/ansible/__init__.py +++ b/docs/testing/user/scenarios/.gitkeep diff --git a/docs/release/userguide/_01-compute.rst b/docs/testing/user/userguide/_01-compute.rst index 56be5488..56be5488 100644 --- a/docs/release/userguide/_01-compute.rst +++ b/docs/testing/user/userguide/_01-compute.rst diff --git a/docs/release/userguide/_02-network.rst b/docs/testing/user/userguide/_02-network.rst index 00fe5b0a..00fe5b0a 100644 --- a/docs/release/userguide/_02-network.rst +++ b/docs/testing/user/userguide/_02-network.rst diff --git a/docs/release/userguide/_03-storage.rst b/docs/testing/user/userguide/_03-storage.rst index b1490432..b1490432 100644 --- a/docs/release/userguide/_03-storage.rst +++ b/docs/testing/user/userguide/_03-storage.rst diff --git a/docs/release/userguide/_testcase_description.rst b/docs/testing/user/userguide/_testcase_description.rst index d60ca949..d60ca949 100644 --- a/docs/release/userguide/_testcase_description.rst +++ b/docs/testing/user/userguide/_testcase_description.rst diff --git a/docs/release/userguide/annex.rst b/docs/testing/user/userguide/annex.rst index e8bf5555..e8bf5555 100644 --- a/docs/release/userguide/annex.rst +++ b/docs/testing/user/userguide/annex.rst diff --git a/docs/release/userguide/benchmark-suites.rst b/docs/testing/user/userguide/benchmark-suites.rst index 84d1c647..84d1c647 100644 --- a/docs/release/userguide/benchmark-suites.rst +++ b/docs/testing/user/userguide/benchmark-suites.rst diff --git a/docs/release/userguide/index.rst b/docs/testing/user/userguide/index.rst index 4be3e498..4be3e498 100644 --- a/docs/release/userguide/index.rst +++ b/docs/testing/user/userguide/index.rst diff --git a/docs/release/userguide/introduction.rst b/docs/testing/user/userguide/introduction.rst index 3147f0aa..3147f0aa 100644 --- a/docs/release/userguide/introduction.rst +++ b/docs/testing/user/userguide/introduction.rst diff --git a/qtip/api/__main__.py b/qtip/api/__main__.py index 89298e6d..aa2941a7 100644 --- a/qtip/api/__main__.py +++ b/qtip/api/__main__.py @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + import connexion diff --git a/qtip/api/swagger/swagger.yaml b/qtip/api/swagger/swagger.yaml index 97a9c352..a5a815f1 100644 --- a/qtip/api/swagger/swagger.yaml +++ b/qtip/api/swagger/swagger.yaml @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2017 akhil.batra@research.iiit.ac.in and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + swagger: '2.0' info: title: QTIP-API diff --git a/qtip/driver/ansible/ansible.py b/qtip/driver/ansible.py index cd17625d..cd17625d 100644 --- a/qtip/driver/ansible/ansible.py +++ b/qtip/driver/ansible.py diff --git a/qtip/driver/ansible/playbook/bwn_ng.yaml b/qtip/driver/playbook/bwn_ng.yaml index 99477856..99477856 100644 --- a/qtip/driver/ansible/playbook/bwn_ng.yaml +++ b/qtip/driver/playbook/bwn_ng.yaml diff --git a/qtip/driver/playbook/dhrystone/clean.yaml b/qtip/driver/playbook/dhrystone/clean.yaml new file mode 100644 index 00000000..72bfab7e --- /dev/null +++ b/qtip/driver/playbook/dhrystone/clean.yaml @@ -0,0 +1,27 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- hosts: hosts + become: yes + remote_user: root + + tasks: + - name: Checking home directory + shell: echo $HOME + register: home_dir + + - name: Cleaning tempT + file: + path: '{{ home_dir.stdout }}/tempT' + state: absent + + - name: Cleaning qtip_result + file: + path: '{{ home_dir.stdout }}/qtip_result' + state: absent diff --git a/qtip/driver/playbook/dhrystone/run.yaml b/qtip/driver/playbook/dhrystone/run.yaml new file mode 100644 index 00000000..55de6597 --- /dev/null +++ b/qtip/driver/playbook/dhrystone/run.yaml @@ -0,0 +1,63 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- hosts: hosts + become: yes + remote_user: root + + tasks: + - name: Get current timestamp + set_fact: + timestamp: "{{ lookup('pipe', 'date +%Y-%m-%d-%H-%M') }}" + + - name: Checking home directory + shell: echo $HOME + register: home_dir + + - name: Fetch hostname + shell: hostname + register: host_name + + - name: Make UnixBench + shell: make --directory $HOME/tempT/UnixBench/ + + - name: Make some directories needed + file: + path: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}' + state: directory + + - include: ../inxi.yaml + + - include: ../top.yaml + + - name: Run dhrystone + shell: ./Run -v dhrystone + args: + chdir: '{{ home_dir.stdout }}/tempT/UnixBench/' + + - name: Copying result to qtip result directory + shell: cp -r $HOME/tempT/UnixBench/results/* ./ + args: + chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}' + + - name: Copy top log to qtip result directory + shell: mv $HOME/qtip_result/top.log ./ + args: + chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}' + + - name: Copy inxi log to qtip result directory + shell: mv $HOME/qtip_result/inxi.log ./ + args: + chdir: '{{ home_dir.stdout }}/qtip_result/{{ timestamp }}/{{ host_name.stdout }}' + + - name: Fetch result files to local manchine + synchronize: + mode: pull + src: '{{ home_dir.stdout }}/qtip_result/' + dest: '{{ result_dir }}/dhrystone/logs/' diff --git a/qtip/driver/playbook/dhrystone/setup.yaml b/qtip/driver/playbook/dhrystone/setup.yaml new file mode 100644 index 00000000..430670c1 --- /dev/null +++ b/qtip/driver/playbook/dhrystone/setup.yaml @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +- hosts: localhost + connection: local + gather_facts: no + + tasks: + - name: Making dhrystone directory + file: + path: '{{ result_dir }}/dhrystone/logs/' + state: directory + +- hosts: hosts + become: yes + remote_user: root + + tasks: + - name: Checking home directory + shell: echo $HOME + register: home_dir + + - name: Cleaning tempT directory + file: + path: '{{ home_dir.stdout }}/tempT' + state: absent + + - name: Cleaning qtip_result directory + file: + path: '{{ home_dir.stdout }}/qtip_result' + state: absent + + - include: ../prepare_env.yaml + + - name: Installing UnixBench dependencies if CentOS + yum: + name: '{{ item }}' + state: present + when: ansible_os_family == "RedHat" + with_items: + - git + - gcc + - patch + - perl-Time-HiRes + + - name: Installing UnixBench dependencies if Ubuntu + apt: + name: '{{ item }}' + state: present + when: ansible_os_family == "Debian" + with_items: + - git + - gcc + - patch + - perl + + - name: Clone unixbench + git: + repo: https://github.com/kdlucas/byte-unixbench.git + dest: '{{ home_dir.stdout }}/tempT' diff --git a/qtip/driver/ansible/playbook/inxi.yaml b/qtip/driver/playbook/inxi.yaml index f6a0311d..f6a0311d 100644 --- a/qtip/driver/ansible/playbook/inxi.yaml +++ b/qtip/driver/playbook/inxi.yaml diff --git a/qtip/driver/ansible/playbook/prepare_env.yaml b/qtip/driver/playbook/prepare_env.yaml index 0595d988..1ec71520 100644 --- a/qtip/driver/ansible/playbook/prepare_env.yaml +++ b/qtip/driver/playbook/prepare_env.yaml @@ -10,7 +10,7 @@ yum: name: epel-release state: present - when: ansible_os_family == "RedHat" + when: ansible_os_family == "RedHat" - name: Software Properties Common apt: @@ -40,3 +40,15 @@ name: python-selinux state: present when: ansible_os_family == "Debian" + +- name: Install rsync when CentOS + yum: + name: rsync + state: present + when: ansible_os_family == "RedHat" + +- name: Install rsync when Ubuntu + apt: + name: rsync + state: present + when: ansible_os_family == "Debian" diff --git a/qtip/driver/ansible/playbook/top.yaml b/qtip/driver/playbook/top.yaml index 8de7e3d6..8de7e3d6 100644 --- a/qtip/driver/ansible/playbook/top.yaml +++ b/qtip/driver/playbook/top.yaml diff --git a/tests/unit/util/logger_test.py b/tests/unit/util/logger_test.py index 339b2bf6..78c4c109 100644 --- a/tests/unit/util/logger_test.py +++ b/tests/unit/util/logger_test.py @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + import pytest from qtip.util import logger |