diff options
| -rw-r--r-- | docs/testing/user/userguide/cli.rst | 55 | ||||
| -rw-r--r-- | qtip/scripts/quickstart.sh | 2 | ||||
| -rw-r--r-- | requirements-frozen.txt | 19 | ||||
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | resources/ansible_roles/ceph-info/tasks/network.yml | 4 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/storage/run.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 49 insertions, 40 deletions
diff --git a/docs/testing/user/userguide/cli.rst b/docs/testing/user/userguide/cli.rst index 8a983155..f0894b01 100644 --- a/docs/testing/user/userguide/cli.rst +++ b/docs/testing/user/userguide/cli.rst @@ -7,7 +7,7 @@ CLI User Manual *************** QTIP consists of a number of benchmarking tools or metrics, grouped under QPI's. QPI's map to the different -components of a NFVI ecosystem, such as compute, network and storage. Depending on the type of application, +components of a NFVi ecosystem, such as compute, network and storage. Depending on the type of application, a user may group them under plans. Bash Command Completion @@ -26,53 +26,60 @@ QTIP CLI provides interface to all of the above the components. A help page prov along with a short description. :: - qtip [-h|--help] + qtip --help Usage ===== -Typically a complete plan is executed at the target environment. QTIP defaults to a number of sample plans. -A list of all the available plans can be viewed +QTIP is currently supports two different QPI's, compute and storage. To list all the supported QPI :: - qtip plan list + qtip qpi list -In order to view the details about a specific plan. +The details of any QPI can be viewed as follows :: - qtip plan show <plan_name> +qtip qpi show <qpi_name> -where *plan_name* is one of those listed from the previous command. - -To execute a complete plan +In order to benchmark either one of them, their respective templates need to be generated :: - qtip plan run <plan_name> -p <path_to_result_directory> + qtip create --project-template [compute|storage] <workspace_name> + +By default, the compute template will be generated. An interactive prompt would gather all parameters specific to +OpenStack installation. -QTIP does not limit result storage at a specific directory. Instead a user may specify his own result storage -as above. An important thing to remember is to provide absolute path of result directory. +Once the template generation is complete, configuration for OpenStack needs to be generated. :: - mkdir result - qtip plan run <plan_name> -p $PWD/result + cd <workspace_name> + qtip setup -Similarly, the same commands can be used for the other two components making up the plans, i.e QPI's and metrics. -For example, in order to run a single metric +This step generates the inventory, populating it with target nodes. + +QTIP can now be run :: - qtip metric run <metric_name> -p $PWD/result + qtip run -The same can be applied for a QPI. +This would start the complete testing suite, which is either compute or storage. Each suite normally takes about +half an hour to complete. -QTIP also provides the utility to view benchmarking results on the console. One just need to provide to where -the results are stored. Extending the example above +Benchmarking report is made for each and every individual section in a QPI, on a particular target node. It consists of +the actual test values on that node along with scores calculated by comparison against a baseline. :: - qtip report show <metric_name> -p $PWD/result + qtip report show [-n|--node] <node> <section_name> + Debugging options ================= -Debug option helps identify the error by providing a detailed traceback. It can be enabled as +QTIP uses Ansible as the runner. One can use all of Ansible's CLI option with QTIP. In order to enable verbose mode +:: + + qtip setup -v + +One may also be able to achieve the different levels of verbosity :: - qtip [-d|--debug] plan run <plan_name> + qtip run [-v|-vv|-vvv] diff --git a/qtip/scripts/quickstart.sh b/qtip/scripts/quickstart.sh index 58a12459..826ed656 100644 --- a/qtip/scripts/quickstart.sh +++ b/qtip/scripts/quickstart.sh @@ -26,7 +26,7 @@ verify_connectivity(){ fi sleep 1 done - error "Can not talk to $ip." + echo "Can not talk to $ip." } #Getoptions diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 0355eb3c..f9225232 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -1,10 +1,13 @@ -ansible==2.1.2.0 -click==6.7 -connexion==1.1.5 -Jinja2==2.9.5 -numpy==1.12.1 -paramiko==2.1.2 -pbr==2.0.0 +humanfriendly==4.4.1 +connexion==1.1.11 +Jinja2==2.9.6 +Django==1.11.5 +asq==1.2.1 +six==1.11.0 +ansible==2.4.0.0 +requests==2.18.4 prettytable==0.7.2 -six==1.10.0 +numpy==1.13.1 +click==6.7 +pbr==3.1.1 PyYAML==3.12 diff --git a/requirements.txt b/requirements.txt index 3b1d7498..97229c29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,13 @@ -colorama ansible click connexion<=1.1.11 Jinja2 numpy -paramiko pbr prettytable six PyYAML humanfriendly asq -Django
\ No newline at end of file +Django +requests diff --git a/resources/ansible_roles/ceph-info/tasks/network.yml b/resources/ansible_roles/ceph-info/tasks/network.yml index d5319c55..4ec7b562 100644 --- a/resources/ansible_roles/ceph-info/tasks/network.yml +++ b/resources/ansible_roles/ceph-info/tasks/network.yml @@ -20,11 +20,11 @@ - fetch: src: /etc/ceph/ceph.conf - dest: "{{ qtip_results }}/sysinfo-{{ inventory_hostname }}/" + dest: "{{ output }}/" flat: yes - name: collect ceph system info from ceph.conf - set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ qtip_results }}/sysinfo-{{ inventory_hostname }}/ceph.conf') }}"} + set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ output }}/ceph.conf') }}"} with_items: - cluster_network delegate_to: localhost diff --git a/resources/ansible_roles/qtip-generator/files/storage/run.yml b/resources/ansible_roles/qtip-generator/files/storage/run.yml index 1ddf0b59..ee605f11 100644 --- a/resources/ansible_roles/qtip-generator/files/storage/run.yml +++ b/resources/ansible_roles/qtip-generator/files/storage/run.yml @@ -13,7 +13,7 @@ roles: - { role: qtip, tasks: setup-local, tags: [setup] } - - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/storperf" } + - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/current/storperf" } - hosts: SUT roles: @@ -38,7 +38,7 @@ builtins = _ exclude = build,dist,doc,legacy,.eggs,.git,.tox,.venv [testenv:reqs] -deps=-rrequirements/test.txt +deps=-rrequirements-test.txt commands= pip-missing-reqs qtip pip-extra-reqs qtip |