diff options
45 files changed, 1094 insertions, 485 deletions
@@ -73,3 +73,9 @@ ChangeLog # unignore external data !/tests/data/**/* + +# integration data +/tests/integration/hosts +/tests/integration/ssh.cfg +/tests/integration/*.retry +/tests/integration/reports/* @@ -38,6 +38,7 @@ Undering macOS system, it will happen to a **fatal error** when installing packa ``` It is for macOS uses TLS instead of OpenSSL and no header files supported. The solutions is: + ``` code=bash # brew install openssl @@ -102,3 +103,4 @@ If you want to include a new repository of third party code. Use ``` git subrepo clone <remote-url> [<subdir>] ``` + diff --git a/docs/testing/developer/devguide/overview.rst b/docs/testing/developer/devguide/overview.rst index 66712155..12f9d9f1 100644 --- a/docs/testing/developer/devguide/overview.rst +++ b/docs/testing/developer/devguide/overview.rst @@ -116,6 +116,17 @@ Docker image #. Fill in ``RELEASE_VERSION`` with version number not including release name, e.g. ``1.0`` #. Trigger a manual build +Python Package +-------------- + +QTIP is also available as a Python Package. It is hosted on the Python Package Index(PyPI). + +#. Install twine with ``pip install twine`` +#. Build the distributions ``python setup.py sdist bdist_wheel`` +#. Upload the distributions built with ``twine upload dist/*`` + +NOTE: only package **maintainers** are permitted to upload the package versions. + Release note ------------ diff --git a/qtip/ansible_library/modules/apex.py b/qtip/ansible_library/modules/apex.py new file mode 100644 index 00000000..218440b2 --- /dev/null +++ b/qtip/ansible_library/modules/apex.py @@ -0,0 +1,133 @@ +#!/usr/bin/python + +############################################################### +# Copyright (c) 2017 ZTE Corporation +# +# 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 +############################################################################## + +from collections import defaultdict +import json +import re + +from ansible.module_utils.basic import AnsibleModule + + +ANSIBLE_METADATA = {'metadata_version': '1.0', + 'status': ['preview'], + 'supported_by': 'community'} + +DOCUMENTATION = ''' +--- +module: apex +short_description: collecting facts from apex environments +description: + - Use this module to create a dynamic inventory from apex undercloud. +version_added: "2.2" +author: "Zhihui Wu" +options: +notes: +requirements: + - Host 'apex-undercloud' is in ~/.ssh/config +''' + +RETURN = ''' +ansible_facts: + description: facts collected for ansible + returned: success + type: dictionary + contains: + hosts: + description: host grouped by hostname, cluster, role and manufacture + type: dict + hosts_meta: + description: hosts meta data indexed by hostname + type: dict +''' + +EXAMPLES = ''' +--- +- hosts: apex-undercloud + tasks: + - name: collect facts of apex hosts + apex: + - debug: var=hostvarsi + - name: add compute node to ansible inventory + add_host: + name: "{{ hosts_meta[item]['ip'] }}" + groups: compute + ansible_user: root + ansible_ssh_common_args: '-o StrictHostKeyChecking=No -o ProxyJump=apex-master' + with_items: "{{ hosts.compute }}" +- hosts: compute + tasks: + - name: check ssh connection + ping: +''' + + +def generate_inventory(baremetal_info, server_info): + """Generate ansible inventory from node list in json format + + Modified from https://github.com/martineg/ansible-apex-inventory/blob/master/apex.py + """ + + hosts = defaultdict(list) + hosts_meta = {} + + for node in baremetal_info: + if node['Provisioning State'].lower() == 'active': + role = re.findall('.+profile:(\w+)$', node['Properties']['capabilities'])[0] + for server in server_info: + if server['ID'] == node['Instance UUID']: + node_ip = re.findall('.+=(\d+.\d+.\d+.\d+)$', server['Networks'])[0] + hosts[role].append(node_ip) + # To match ssh.cfg.j2 template + hosts_meta[node_ip] = {'ansible_ssh_host': node_ip} + + for host in hosts: + hosts[host].sort() + + return {'hosts': hosts, 'hosts_meta': hosts_meta} + + +def main(): + module = AnsibleModule(argument_spec=dict()) + + (rc, out, err) = module.run_command(['source ~/stackrc']) + + if rc is not None and rc != 0: + return module.fail_json(msg=err) + + cmd = [module.get_bin_path('openstack', True), + 'baremetal', + 'list', + '--fields instance_uuid properties provision_state', + '--format json'] + (rc, out, err) = module.run_command(cmd) + + if rc is not None and rc != 0: + return module.fail_json(msg=err) + + baremetal_info = json.loads(out) + + cmd = [module.get_bin_path('openstack', True), + 'server', + 'list', + '--format json'] + (rc, out, err) = module.run_command(cmd) + + if rc is not None and rc != 0: + return module.fail_json(msg=err) + + server_info = json.loads(out) + + module.exit_json(changed=False, + ansible_facts=generate_inventory(baremetal_info, server_info)) + + +if __name__ == '__main__': + main() diff --git a/qtip/ansible_library/plugins/action/aggregate.py b/qtip/ansible_library/plugins/action/aggregate.py new file mode 100644 index 00000000..6e280419 --- /dev/null +++ b/qtip/ansible_library/plugins/action/aggregate.py @@ -0,0 +1,36 @@ +#!/usr/bin/python + +############################################################### +# Copyright (c) 2017 ZTE Corporation +# +# 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 +############################################################################## + +from numpy import mean + +from ansible.plugins.action import ActionBase + + +class ActionModule(ActionBase): + def run(self, tmp=None, task_vars=None): + + if task_vars is None: + task_vars = dict() + + result = super(ActionModule, self).run(tmp, task_vars) + + if result.get('skipped', False): + return result + + return aggregate(self._task.args.get('group'), task_vars) + + +# aggregate QPI results +def aggregate(group, task_vars): + qpi_results = [task_vars['hostvars'][host]['qpi_result'] for host in task_vars['groups'][group]] + return { + 'score': int(mean([r['score'] for r in qpi_results])) + } diff --git a/qtip/ansible_library/plugins/action/calculate.py b/qtip/ansible_library/plugins/action/calculate.py new file mode 100644 index 00000000..fade367f --- /dev/null +++ b/qtip/ansible_library/plugins/action/calculate.py @@ -0,0 +1,90 @@ +#!/usr/bin/python + +############################################################### +# Copyright (c) 2017 ZTE Corporation +# +# 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 +############################################################################## + +from numpy import mean +import yaml + +from ansible.plugins.action import ActionBase +from ansible.utils.display import Display + +display = Display() + + +class ActionModule(ActionBase): + def run(self, tmp=None, task_vars=None): + + if task_vars is None: + task_vars = dict() + + result = super(ActionModule, self).run(tmp, task_vars) + + if result.get('skipped', False): + return result + + with open(self._task.args.get('spec')) as stream: + spec = yaml.safe_load(stream) + + metrics = self._task.args.get('metrics') + + return calc_qpi(spec, metrics) + + +def calc_qpi(qpi_spec, metrics): + + display.vv("calculate QPI {}".format(qpi_spec['name'])) + display.vvv("spec: {}".format(qpi_spec)) + display.vvv("metrics: {}".format(metrics)) + + section_results = [{'name': s['name'], 'result': calc_section(s, metrics)} + for s in qpi_spec['sections']] + + # TODO(yujunz): use formula in spec + standard_score = 2048 + qpi_score = int(mean([r['result']['score'] for r in section_results]) * standard_score) + return { + 'spec': qpi_spec, + 'score': qpi_score, + 'section_results': section_results, + 'metrics': metrics + } + + +def calc_section(section_spec, metrics): + + display.vv("calculate section {}".format(section_spec['name'])) + display.vvv("spec: {}".format(section_spec)) + display.vvv("metrics: {}".format(metrics)) + + metric_results = [{'name': m['name'], 'result': calc_metric(m, metrics[m['name']])} + for m in section_spec['metrics']] + # TODO(yujunz): use formula in spec + section_score = mean([r['result']['score'] for r in metric_results]) + return { + 'score': section_score, + 'metric_results': metric_results + } + + +def calc_metric(metric_spec, metrics): + + display.vv("calculate metric {}".format(metric_spec['name'])) + display.vvv("spec: {}".format(metric_spec)) + display.vvv("metrics: {}".format(metrics)) + + # TODO(yujunz): use formula in spec + # TODO(yujunz): convert metric to float in collector + workload_results = [{'name': w['name'], 'score': mean([float(m) for m in metrics[w['name']]]) / w['baseline']} + for w in metric_spec['workloads']] + metric_score = mean([r['score'] for r in workload_results]) + return { + 'score': metric_score, + 'workload_results': workload_results + } diff --git a/qtip/ansible_library/plugins/action/collect.py b/qtip/ansible_library/plugins/action/collect.py index 88ad0e35..26e813b8 100644 --- a/qtip/ansible_library/plugins/action/collect.py +++ b/qtip/ansible_library/plugins/action/collect.py @@ -10,6 +10,7 @@ ############################################################################## from collections import defaultdict +import os import re from ansible.plugins.action import ActionBase @@ -26,6 +27,10 @@ class ActionModule(ActionBase): string = self._task.args.get('string') patterns = self._task.args.get('patterns') + dump = self._task.args.get('dump') + if dump is not None: + dump_facts(task_vars['inventory_hostname'], [{'name': 'inxi.log', 'content': string}]) + return collect(patterns, string) @@ -43,3 +48,11 @@ def collect(patterns, string): captured[key].append(value) return captured + + +def dump_facts(hostname, facts): + dump_root = os.path.join('dump', hostname) + if not os.path.exists(dump_root): + os.mkdir(dump_root) + return [{'name': fact['name'], 'result': open(os.path.join(dump_root, fact['name']), 'w+').write(fact['content'])} + for fact in facts] diff --git a/qtip/base/error.py b/qtip/base/error.py index f23d8cd9..d4b516ac 100644 --- a/qtip/base/error.py +++ b/qtip/base/error.py @@ -16,12 +16,14 @@ class InvalidContentError(BaseError): def __init__(self, filename, excinfo=None): self.filename = filename self.excinfo = excinfo + self.message = "Invalid content in {0}".format(filename) class NotFoundError(BaseError): def __init__(self, needle, heystack='qtip'): self.needle = needle self.heystack = heystack + self.message = "{0} not found in {1}".format(needle[0:-5], heystack) class ToBeDoneError(BaseError): diff --git a/qtip/cli/commands/cmd_metric.py b/qtip/cli/commands/cmd_metric.py index a2208444..1741fb48 100644 --- a/qtip/cli/commands/cmd_metric.py +++ b/qtip/cli/commands/cmd_metric.py @@ -8,8 +8,11 @@ ############################################################################## import click +from colorama import Fore import os +from qtip.base.error import InvalidContentError +from qtip.base.error import NotFoundError from qtip.cli import utils from qtip.cli.entry import Context from qtip.loader.metric import MetricSpec @@ -36,10 +39,16 @@ def cmd_list(ctx): @click.argument('name') @pass_context def show(ctx, name): - metric = MetricSpec('{}.yaml'.format(name)) - cnt = metric.content - output = utils.render('metric', cnt) - click.echo(output) + try: + metric = MetricSpec('{}.yaml'.format(name)) + except NotFoundError as nf: + click.echo(Fore.RED + "ERROR: metric spec: " + nf.message) + except InvalidContentError as ice: + click.echo(Fore.RED + "ERROR: metric spec " + ice.message) + else: + cnt = metric.content + output = utils.render('metric', cnt) + click.echo(output) @cli.command('run', help='Run performance test') diff --git a/qtip/cli/commands/cmd_plan.py b/qtip/cli/commands/cmd_plan.py index beb61b0e..b7c540b7 100644 --- a/qtip/cli/commands/cmd_plan.py +++ b/qtip/cli/commands/cmd_plan.py @@ -9,8 +9,11 @@ import click +from colorama import Fore import os +from qtip.base.error import InvalidContentError +from qtip.base.error import NotFoundError from qtip.cli import utils from qtip.cli.entry import Context from qtip.loader.plan import Plan @@ -44,10 +47,16 @@ def list(ctx): @click.argument('name') @pass_context def show(ctx, name): - plan = Plan('{}.yaml'.format(name)) - cnt = plan.content - output = utils.render('plan', cnt) - click.echo(output) + try: + plan = Plan('{}.yaml'.format(name)) + except NotFoundError as nf: + click.echo(Fore.RED + "ERROR: plan spec: " + nf.message) + except InvalidContentError as ice: + click.echo(Fore.RED + "ERROR: plan spec: " + ice.message) + else: + cnt = plan.content + output = utils.render('plan', cnt) + click.echo(output) @cli.command('run', help='Execute a Plan') diff --git a/qtip/cli/commands/cmd_qpi.py b/qtip/cli/commands/cmd_qpi.py index 1e3671c5..a47442b7 100644 --- a/qtip/cli/commands/cmd_qpi.py +++ b/qtip/cli/commands/cmd_qpi.py @@ -9,8 +9,11 @@ import click +from colorama import Fore import os +from qtip.base.error import InvalidContentError +from qtip.base.error import NotFoundError from qtip.cli import utils from qtip.cli.entry import Context from qtip.loader.qpi import QPISpec @@ -37,10 +40,16 @@ def cmd_list(ctx): @click.argument('name') @pass_context def show(ctx, name): - qpi = QPISpec('{}.yaml'.format(name)) - cnt = qpi.content - output = utils.render('qpi', cnt) - click.echo(output) + try: + qpi = QPISpec('{}.yaml'.format(name)) + except NotFoundError as nf: + click.echo(Fore.RED + "ERROR: qpi spec: " + nf.message) + except InvalidContentError as ice: + click.echo(Fore.RED + "ERROR: qpi spec: " + ice.message) + else: + cnt = qpi.content + output = utils.render('qpi', cnt) + click.echo(output) @cli.command('run', help='Run performance tests for the specified QPI') diff --git a/qtip/cli/entry.py b/qtip/cli/entry.py index 6cf78b58..b84a03d0 100644 --- a/qtip/cli/entry.py +++ b/qtip/cli/entry.py @@ -9,6 +9,7 @@ import click import os +import pkg_resources as pkg import sys @@ -53,7 +54,7 @@ class QtipCli(click.MultiCommand): invoke_without_command=True) @click.option('-v', '--verbose', is_flag=True, help='Enable verbose mode.') @click.option('-d', '--debug', is_flag=True, help='Enable debug mode.') -@click.version_option('dev') +@click.version_option(pkg.require("qtip")[0]) @pass_context def cli(ctx, verbose, debug): if debug: diff --git a/qtip/reporter/testapi.py b/qtip/reporter/testapi.py index a0be5379..2e4205ea 100644 --- a/qtip/reporter/testapi.py +++ b/qtip/reporter/testapi.py @@ -7,8 +7,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -import requests +# OPNFV Testapi Client +# +# API url: http://testresults.opnfv.org/test/api/v1 +# API spec: +# - http://testresults.opnfv.org/test/swagger/spec.html#!/spec/queryTestResults +# - http://testresults.opnfv.org/test/swagger/spec.html#!/spec/createTestResult +# Login: +# username: opnfv +# password: contact admin +# Self host: https://github.com/opnfv/releng/tree/master/utils/test/testapi/deployment +import requests payload_template = {'project_name', 'case_name', @@ -29,19 +39,21 @@ def validate_payload(): if set(payload.keys()) != payload_template: missing_parameters = list(payload_template - set(payload.keys())) - print "Missing Parameters -- {}".\ - format(",".join(missing_parameters)) + print("Missing Parameters -- {}". + format(",".join(missing_parameters))) raise MissingParamsError("push_results", missing_parameters) invalid_params = [] for key in payload: if (payload[key] == "") or (payload[key] is None): invalid_params.append(key) if len(invalid_params) > 0: - print "Invalid or missing values of parameters -- `{}`".\ - format(",".join(invalid_params)) + print ("Invalid or missing values of parameters -- `{}`". + format(",".join(invalid_params))) raise InvalidParamsError("push_results", invalid_params) return func(testapi_url, payload) + return _execute + return _decorator diff --git a/requirements.txt b/requirements.txt index b0926b56..0f408520 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +colorama ansible click connexion diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml new file mode 100644 index 00000000..736aef22 --- /dev/null +++ b/resources/QPI/compute.yaml @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2016 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 +############################################################################## +name: compute +description: QTIP Performance Index of compute +formula: weighted arithmetic mean +sections: # split based on different application + - name: SSL + description: cryptography and SSL/TLS performance + formula: geometric mean + metrics: + - name: ssl_rsa + formual: geometric mean + workloads: + - name: rsa_sign_512 + description: RSA signature 512 bits + baseline: 14982.3 + - name: rsa_verify_512 + baseline: 180619.2 + - name: rsa_sign_1024 + baseline: 5037.7 + - name: rsa_verify_1024 + baseline: 67359.9 + - name: rsa_sign_2048 + baseline: 713.6 + - name: rsa_verify_2048 + baseline: 23458.0 + - name: rsa_sign_4096 + baseline: 102.1 + - name: rsa_verify_4096 + baseline: 6402.9 diff --git a/tests/integration/tasks/inxi.yaml b/resources/metric/inxi.yaml index f8951dc1..47eb2e73 100644 --- a/tests/integration/tasks/inxi.yaml +++ b/resources/metric/inxi.yaml @@ -14,11 +14,24 @@ - name: check hardware information with inxi command: inxi -b -c0 -n - register: inxi_log + register: inxi_out +# TODO(yujunz) normalize system information, test condition and performance metrics for future data mining +# e.g. convert "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz" to +# --- +# processor: +# id: +# vendor: Intel +# product_family: Xeon +# processor_number: E5-2650 v3s +# number_of_cores: 2 +# number_of_threads: None # set `None` when data is not available +# base_frequency_mhz: 1200 +# max_turbo_frequency_mhz: 3000 +# cache_mb: None - name: collect system information from inxi collect: - string: "{{ inxi_log.stdout }}" + string: "{{ inxi_out.stdout }}" patterns: - '.+\s+Host:\s+(?P<hostname>.+)\sKernel' - '.+\sMemory:\s+(?P<memory>.+MB)\s' @@ -27,4 +40,5 @@ - '.+\sKernel:\s+(?P<kernel>.+)\sConsole' - '.+\s+HDD Total Size:\s+(?P<disk>.+)\s' - '.+\sproduct:\s+(?P<product>.+)\sv' - register: inxi_info + dump: 'inix.log' + register: system_info diff --git a/resources/metric/openssl.yaml b/resources/metric/openssl.yaml new file mode 100644 index 00000000..2dda0e33 --- /dev/null +++ b/resources/metric/openssl.yaml @@ -0,0 +1,54 @@ +############################################################################## +# 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 +############################################################################## + +- name: install openssl - Cryptography and SSL/TLS Toolkit + package: + name: openssl + state: present + +- name: RSA signatures speed measurement + command: openssl speed rsa + register: openssl_rsa_log + +#- name: AES speed measurement +# command: openssl speed -evp aes-128-cbc +# register: openssl_aes_log + +- name: collect ssl metrics from openssl + collect: + string: "{{ openssl_rsa_log.stdout }}" + patterns: + - |- + ^rsa\s+512\sbits\s.+\s+ + ?(?P<rsa_sign_512>\d+\.\d)\s+ + ?(?P<rsa_verify_512>\d+\.\d)$ + - |- + ^rsa\s+1024\sbits\s.+\s+ + ?(?P<rsa_sign_1024>\d+\.\d)\s+ + ?(?P<rsa_verify_1024>\d+\.\d)$ + - |- + ^rsa\s+2048\sbits\s.+\s+ + ?(?P<rsa_sign_2048>\d+\.\d)\s+ + ?(?P<rsa_verify_2048>\d+\.\d)$ + - |- + ^rsa\s+4096\sbits\s.+\s+ + ?(?P<rsa_sign_4096>\d+\.\d)\s+ + ?(?P<rsa_verify_4096>\d+\.\d)$ + dump: openssl_rsa_log + register: openssl_rsa_metrics + +# - filename: AES-128-CBC_dump +# grep: +# - |- +# ^aes-128-cbc\s+ +# ?(?P<aes_128_cbc_16_bytes>\d+\.\w+)\s+ +# ?(?P<aes_128_cbc_64_bytes>\d+\.\w+)\s+ +# ?(?P<aes_128_cbc_256_bytes>\d+\.\w+)\s+ +# ?(?P<aes_128_cbc_1024_bytes>\d+\.\w+)\s+ +# ?(?P<aes_128_cbc_8192_bytes>\d+\.\w+)$ diff --git a/resources/template/hosts.j2 b/resources/template/hosts.j2 new file mode 100644 index 00000000..868a4e57 --- /dev/null +++ b/resources/template/hosts.j2 @@ -0,0 +1,21 @@ +[fuel-master] +fuel-master + +[local] +localhost ansible_connection=local + +[fuel-groups:children] +{% for group in hosts|sort %} +{{ group }} +{% endfor %} + +[fuel-groups:vars] +ansible_ssh_common_args=-F ./ssh.cfg + +{% for group in hosts|sort %} +[{{ group }}] +{% for host in hosts[group]|sort %} +{{ host }} +{% endfor %} + +{% endfor %} diff --git a/resources/template/hosts.sample b/resources/template/hosts.sample new file mode 100644 index 00000000..e37d38ec --- /dev/null +++ b/resources/template/hosts.sample @@ -0,0 +1,83 @@ +[fuel-master] +fuel-master + +[local] +localhost ansible_connection=local + +[fuel-groups:children] +ceph-osd +cluster-1 +compute +controller +hw-zte-servers +mongo +node-1 +node-2 +node-3 +node-4 +node-5 +node-6 +node-7 + +[fuel-groups:vars] +ansible_ssh_common_args=-F ./ssh.cfg + +[ceph-osd] +node-2 +node-4 +node-6 +node-7 + +[cluster-1] +node-1 +node-2 +node-3 +node-4 +node-5 +node-6 +node-7 + +[compute] +node-2 +node-4 +node-6 +node-7 + +[controller] +node-1 +node-3 +node-5 + +[hw-zte-servers] +node-1 +node-2 +node-3 +node-4 +node-5 +node-6 +node-7 + +[mongo] +node-1 + +[node-1] +node-1 + +[node-2] +node-2 + +[node-3] +node-3 + +[node-4] +node-4 + +[node-5] +node-5 + +[node-6] +node-6 + +[node-7] +node-7 + diff --git a/resources/template/qpi-report.j2 b/resources/template/qpi-report.j2 new file mode 100644 index 00000000..6ca73634 --- /dev/null +++ b/resources/template/qpi-report.j2 @@ -0,0 +1,21 @@ +Sample QPI Report + +Pod: {{ pod_result.score }} + +{% for host in groups['compute'] %} +{% set qpi_result = hostvars[host].qpi_result %} + +Host: {{ hostvars[host].ansible_hostname }} +QPI: {{ qpi_result.score }} +Spec: {{ qpi_result.spec.name }} + +{% for section in qpi_result.section_results %} +- {{ section.name }}: {{ section.result.score }} +{% for metric in section.result.metric_results %} + - {{ metric.name }}: {{ metric.result.score }} +{% for workload in metric.result.workload_results %} + - {{ workload.name }}: {{ workload.score }} +{% endfor %} +{% endfor %} +{% endfor %} +{% endfor %} diff --git a/resources/template/qpi-report.sample b/resources/template/qpi-report.sample new file mode 100644 index 00000000..cb9e9308 --- /dev/null +++ b/resources/template/qpi-report.sample @@ -0,0 +1,46 @@ +Sample QPI Report + +Host: node-26 +QPI: 1.41147857985 +Spec: compute + +- SSL: 1.41147857985 + - ssl_rsa: 1.41147857985 + - rsa_sign_512: 1.25261808935 + - rsa_verify_512: 1.33973907536 + - rsa_sign_1024: 1.31933223495 + - rsa_verify_1024: 1.46972456907 + - rsa_sign_2048: 1.8615470852 + - rsa_verify_2048: 1.3683903146 + - rsa_sign_4096: 1.31537708129 + - rsa_verify_4096: 1.36510018898 + +Host: node-28 +QPI: 1.28082308651 +Spec: compute + +- SSL: 1.28082308651 + - ssl_rsa: 1.28082308651 + - rsa_sign_512: 1.13628081136 + - rsa_verify_512: 1.24882238433 + - rsa_sign_1024: 1.16100601465 + - rsa_verify_1024: 1.33382620817 + - rsa_sign_2048: 1.72057174888 + - rsa_verify_2048: 1.23917640038 + - rsa_sign_4096: 1.16846229187 + - rsa_verify_4096: 1.2384388324 + +Host: node-27 +QPI: 1.41542492777 +Spec: compute + +- SSL: 1.41542492777 + - ssl_rsa: 1.41542492777 + - rsa_sign_512: 1.25857845591 + - rsa_verify_512: 1.34193319426 + - rsa_sign_1024: 1.32097981222 + - rsa_verify_1024: 1.4807103336 + - rsa_sign_2048: 1.86378923767 + - rsa_verify_2048: 1.36600306932 + - rsa_sign_4096: 1.31635651322 + - rsa_verify_4096: 1.37504880601 diff --git a/resources/template/ssh.cfg.j2 b/resources/template/ssh.cfg.j2 new file mode 100644 index 00000000..2fe049e2 --- /dev/null +++ b/resources/template/ssh.cfg.j2 @@ -0,0 +1,14 @@ +# Connect to target node through jump host +# +# OpenSSH 7.3: +# ProxyJump jumphost +# before OpenSSH 7.3 +# ProxyCommand ssh -o 'ForwardAgent yes' jumphost 'ssh-add && nc %h %p' + +{% for (name, host) in hosts_meta.items() %} +Host {{ name }} + HostName {{ host.ansible_ssh_host }} + User root + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + +{% endfor %} diff --git a/resources/template/ssh.cfg.sample b/resources/template/ssh.cfg.sample new file mode 100644 index 00000000..efa45ab6 --- /dev/null +++ b/resources/template/ssh.cfg.sample @@ -0,0 +1,56 @@ +Host node-5 + HostName 10.20.5.12 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-4 + HostName 10.20.5.14 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-7 + HostName 10.20.5.15 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-6 + HostName 10.20.5.16 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-1 + HostName 10.20.5.10 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-3 + HostName 10.20.5.11 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + +Host node-2 + HostName 10.20.5.13 + User root + # Use `ProxyCommand` for OpenSSH before 7.3 + ProxyCommand ssh -o 'ForwardAgent yes' fuel-master 'ssh-add && nc %h %p' + # `ProxyJump` is available since OpenSSH 7.3 + # ProxyJump fuel-master + diff --git a/resources/template/system-info.j2 b/resources/template/system-info.j2 new file mode 100644 index 00000000..305a2af2 --- /dev/null +++ b/resources/template/system-info.j2 @@ -0,0 +1,16 @@ +System Information from inxi +============================ + +{% for host in groups['compute'] %} +{{ hostvars[host].ansible_hostname }} +----------------------------- + +{{ ('CPU Brand', hostvars[host].system_info.cpu[0])|justify }} +{{ ('Disk', hostvars[host].system_info.disk[0])|justify }} +{{ ('Host Name', hostvars[host].system_info.hostname[0])|justify }} +{{ ('Kernel', hostvars[host].system_info.kernel[0])|justify }} +{{ ('Memory', hostvars[host].system_info.memory[0])|justify }} +{{ ('Operating System', hostvars[host].system_info.os[0])|justify }} +{{ ('Product', hostvars[host].system_info.product[0])|justify }} + +{% endfor %} diff --git a/tests/integration/reports/inxi-system-info b/resources/template/system-info.sample index 371243e2..371243e2 100644 --- a/tests/integration/reports/inxi-system-info +++ b/resources/template/system-info.sample @@ -1,5 +1,6 @@ [metadata] name = qtip +version = 5.0.0 summary = Platform Performance Benchmarking description-file = README.md diff --git a/tests/data/external/apex/baremetal_info.json b/tests/data/external/apex/baremetal_info.json new file mode 100755 index 00000000..8efe4e71 --- /dev/null +++ b/tests/data/external/apex/baremetal_info.json @@ -0,0 +1,57 @@ +[ + { + "Properties": { + "memory_mb": "8192", + "cpu_arch": "x86_64", + "local_gb": "41", + "cpus": "4", + "capabilities": "boot_option:local,profile:compute" + }, + "Provisioning State": "active", + "Instance UUID": "367827af-966c-4c91-bad4-d8dc12750eac" + }, + { + "Properties": { + "memory_mb": "8192", + "cpu_arch": "x86_64", + "local_gb": "41", + "cpus": "4", + "capabilities": "boot_option:local,profile:compute" + }, + "Provisioning State": "active", + "Instance UUID": "f214f844-ec4d-4f33-9d16-9aa21ade3cb4" + }, + { + "Properties": { + "memory_mb": "8192", + "cpu_arch": "x86_64", + "local_gb": "41", + "cpus": "4", + "capabilities": "boot_option:local,profile:control" + }, + "Provisioning State": "active", + "Instance UUID": "06234a4d-45fb-4930-bf8a-9b1627b1621f" + }, + { + "Properties": { + "memory_mb": "8192", + "cpu_arch": "x86_64", + "local_gb": "41", + "cpus": "4", + "capabilities": "boot_option:local,profile:control" + }, + "Provisioning State": "active", + "Instance UUID": "6dfd4c85-8a05-49ea-bd73-15dbaf84fa9b" + }, + { + "Properties": { + "memory_mb": "8192", + "cpu_arch": "x86_64", + "local_gb": "41", + "cpus": "4", + "capabilities": "boot_option:local,profile:control" + }, + "Provisioning State": "active", + "Instance UUID": "25b73b47-7c22-4f58-8ff3-ba5d714baa7c" + } +] diff --git a/tests/data/external/apex/server_info.json b/tests/data/external/apex/server_info.json new file mode 100755 index 00000000..71bc40c5 --- /dev/null +++ b/tests/data/external/apex/server_info.json @@ -0,0 +1,37 @@ +[ + { + "Status": "ACTIVE", + "Networks": "ctlplane=192.0.2.9", + "ID": "06234a4d-45fb-4930-bf8a-9b1627b1621f", + "Image Name": "overcloud-full", + "Name": "overcloud-controller-2" + }, + { + "Status": "ACTIVE", + "Networks": "ctlplane=192.0.2.7", + "ID": "6dfd4c85-8a05-49ea-bd73-15dbaf84fa9b", + "Image Name": "overcloud-full", + "Name": "overcloud-controller-0" + }, + { + "Status": "ACTIVE", + "Networks": "ctlplane=192.0.2.8", + "ID": "25b73b47-7c22-4f58-8ff3-ba5d714baa7c", + "Image Name": "overcloud-full", + "Name": "overcloud-controller-1" + }, + { + "Status": "ACTIVE", + "Networks": "ctlplane=192.0.2.6", + "ID": "f214f844-ec4d-4f33-9d16-9aa21ade3cb4", + "Image Name": "overcloud-full", + "Name": "overcloud-novacompute-0" + }, + { + "Status": "ACTIVE", + "Networks": "ctlplane=192.0.2.5", + "ID": "367827af-966c-4c91-bad4-d8dc12750eac", + "Image Name": "overcloud-full", + "Name": "overcloud-novacompute-1" + } +]
\ No newline at end of file diff --git a/tests/integration/ansible.cfg b/tests/integration/ansible.cfg index 85966e13..40e28bcf 100644 --- a/tests/integration/ansible.cfg +++ b/tests/integration/ansible.cfg @@ -13,163 +13,6 @@ inventory = ./hosts library = ../../qtip/ansible_library/ -#module_utils = /usr/share/my_module_utils/ -#remote_tmp = ~/.ansible/tmp -#local_tmp = ~/.ansible/tmp -#forks = 5 -#poll_interval = 15 -#sudo_user = root -#ask_sudo_pass = True -#ask_pass = True -#transport = smart -#remote_port = 22 -#module_lang = C -#module_set_locale = False - -# plays will gather facts by default, which contain information about -# the remote system. -# -# smart - gather by default, but don't regather if already gathered -# implicit - gather by default, turn off with gather_facts: False -# explicit - do not gather by default, must say gather_facts: True -#gathering = implicit - -# This only affects the gathering done by a play's gather_facts directive, -# by default gathering retrieves all facts subsets -# all - gather all subsets -# network - gather min and network facts -# hardware - gather hardware facts (longest facts to retrieve) -# virtual - gather min and virtual facts -# facter - import facts from facter -# ohai - import facts from ohai -# You can combine them using comma (ex: network,virtual) -# You can negate them using ! (ex: !hardware,!facter,!ohai) -# A minimal set of facts is always gathered. -#gather_subset = all - -# some hardware related facts are collected -# with a maximum timeout of 10 seconds. This -# option lets you increase or decrease that -# timeout to something more suitable for the -# environment. -# gather_timeout = 10 - -# additional paths to search for roles in, colon separated -#roles_path = /etc/ansible/roles - -# uncomment this to disable SSH key host checking -#host_key_checking = False - -# change the default callback -#stdout_callback = skippy -# enable additional callbacks -#callback_whitelist = timer, mail - -# Determine whether includes in tasks and handlers are "static" by -# default. As of 2.0, includes are dynamic by default. Setting these -# values to True will make includes behave more like they did in the -# 1.x versions. -#task_includes_static = True -#handler_includes_static = True - -# Controls if a missing handler for a notification event is an error or a warning -#error_on_missing_handler = True - -# change this for alternative sudo implementations -#sudo_exe = sudo - -# What flags to pass to sudo -# WARNING: leaving out the defaults might create unexpected behaviours -#sudo_flags = -H -S -n - -# SSH timeout -#timeout = 10 - -# default user to use for playbooks if user is not specified -# (/usr/bin/ansible will use current user as default) -#remote_user = root - -# logging is off by default unless this path is defined -# if so defined, consider logrotate -#log_path = /var/log/ansible.log - -# default module name for /usr/bin/ansible -#module_name = command - -# use this shell for commands executed under sudo -# you may need to change this to bin/bash in rare instances -# if sudo is constrained -#executable = /bin/sh - -# if inventory variables overlap, does the higher precedence one win -# or are hash values merged together? The default is 'replace' but -# this can also be set to 'merge'. -#hash_behaviour = replace - -# by default, variables from roles will be visible in the global variable -# scope. To prevent this, the following option can be enabled, and only -# tasks and handlers within the role will see the variables there -#private_role_vars = yes - -# list any Jinja2 extensions to enable here: -#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n - -# if set, always use this private key file for authentication, same as -# if passing --private-key to ansible or ansible-playbook -#private_key_file = /path/to/file - -# If set, configures the path to the Vault password file as an alternative to -# specifying --vault-password-file on the command line. -#vault_password_file = /path/to/vault_password_file - -# format of string {{ ansible_managed }} available within Jinja2 -# templates indicates to users editing templates files will be replaced. -# replacing {file}, {host} and {uid} and strftime codes with proper values. -#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} -# {file}, {host}, {uid}, and the timestamp can all interfere with idempotence -# in some situations so the default is a static string: -#ansible_managed = Ansible managed - -# by default, ansible-playbook will display "Skipping [host]" if it determines a task -# should not be run on a host. Set this to "False" if you don't want to see these "Skipping" -# messages. NOTE: the task header will still be shown regardless of whether or not the -# task is skipped. -#display_skipped_hosts = True - -# by default, if a task in a playbook does not include a name: field then -# ansible-playbook will construct a header that includes the task's action but -# not the task's args. This is a security feature because ansible cannot know -# if the *module* considers an argument to be no_log at the time that the -# header is printed. If your environment doesn't have a problem securing -# stdout from ansible-playbook (or you have manually specified no_log in your -# playbook on all of the tasks where you have secret information) then you can -# safely set this to True to get more informative messages. -#display_args_to_stdout = False - -# by default (as of 1.3), Ansible will raise errors when attempting to dereference -# Jinja2 variables that are not set in templates or action lines. Uncomment this line -# to revert the behavior to pre-1.3. -#error_on_undefined_vars = False - -# by default (as of 1.6), Ansible may display warnings based on the configuration of the -# system running ansible itself. This may include warnings about 3rd party packages or -# other conditions that should be resolved if possible. -# to disable these warnings, set the following value to False: -#system_warnings = True - -# by default (as of 1.4), Ansible may display deprecation warnings for language -# features that should no longer be used and will be removed in future versions. -# to disable these warnings, set the following value to False: -#deprecation_warnings = True - -# (as of 1.8), Ansible can optionally warn when usage of the shell and -# command module appear to be simplified by using a default Ansible module -# instead. These warnings can be silenced by adjusting the following -# setting or adding warn=yes or warn=no to the end of the command line -# parameter string. This will for example suggest using the git module -# instead of shelling out to the git command. -# command_warnings = False - # set plugin path directories here, separate with colons action_plugins = ../../qtip/ansible_library/plugins/action @@ -183,261 +26,3 @@ filter_plugins = ../../qtip/ansible_library/plugins/filter #test_plugins = /usr/share/ansible/plugins/test #terminal_plugins = /usr/share/ansible/plugins/terminal #strategy_plugins = /usr/share/ansible/plugins/strategy - - -# by default, ansible will use the 'linear' strategy but you may want to try -# another one -#strategy = free - -# by default callbacks are not loaded for /bin/ansible, enable this if you -# want, for example, a notification or logging callback to also apply to -# /bin/ansible runs -#bin_ansible_callbacks = False - - -# don't like cows? that's unfortunate. -# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 -#nocows = 1 - -# set which cowsay stencil you'd like to use by default. When set to 'random', -# a random stencil will be selected for each task. The selection will be filtered -# against the `cow_whitelist` option below. -#cow_selection = default -#cow_selection = random - -# when using the 'random' option for cowsay, stencils will be restricted to this list. -# it should be formatted as a comma-separated list with no spaces between names. -# NOTE: line continuations here are for formatting purposes only, as the INI parser -# in python does not support them. -#cow_whitelist=bud-frogs,bunny,cheese,daemon,default,dragon,elephant-in-snake,elephant,eyes,\ -# hellokitty,kitty,luke-koala,meow,milk,moofasa,moose,ren,sheep,small,stegosaurus,\ -# stimpy,supermilker,three-eyes,turkey,turtle,tux,udder,vader-koala,vader,www - -# don't like colors either? -# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1 -#nocolor = 1 - -# if set to a persistent type (not 'memory', for example 'redis') fact values -# from previous runs in Ansible will be stored. This may be useful when -# wanting to use, for example, IP information from one group of servers -# without having to talk to them in the same playbook run to get their -# current IP information. -#fact_caching = memory - - -# retry files -# When a playbook fails by default a .retry file will be created in ~/ -# You can disable this feature by setting retry_files_enabled to False -# and you can change the location of the files by setting retry_files_save_path - -#retry_files_enabled = False -#retry_files_save_path = ~/.ansible-retry - -# squash actions -# Ansible can optimise actions that call modules with list parameters -# when looping. Instead of calling the module once per with_ item, the -# module is called once with all items at once. Currently this only works -# under limited circumstances, and only with parameters named 'name'. -#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper - -# prevents logging of task data, off by default -#no_log = False - -# prevents logging of tasks, but only on the targets, data is still logged on the master/controller -#no_target_syslog = False - -# controls whether Ansible will raise an error or warning if a task has no -# choice but to create world readable temporary files to execute a module on -# the remote machine. This option is False by default for security. Users may -# turn this on to have behaviour more like Ansible prior to 2.1.x. See -# https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user -# for more secure ways to fix this than enabling this option. -#allow_world_readable_tmpfiles = False - -# controls the compression level of variables sent to -# worker processes. At the default of 0, no compression -# is used. This value must be an integer from 0 to 9. -#var_compression_level = 9 - -# controls what compression method is used for new-style ansible modules when -# they are sent to the remote system. The compression types depend on having -# support compiled into both the controller's python and the client's python. -# The names should match with the python Zipfile compression types: -# * ZIP_STORED (no compression. available everywhere) -# * ZIP_DEFLATED (uses zlib, the default) -# These values may be set per host via the ansible_module_compression inventory -# variable -#module_compression = 'ZIP_DEFLATED' - -# This controls the cutoff point (in bytes) on --diff for files -# set to 0 for unlimited (RAM may suffer!). -#max_diff_size = 1048576 - -# This controls how ansible handles multiple --tags and --skip-tags arguments -# on the CLI. If this is True then multiple arguments are merged together. If -# it is False, then the last specified argument is used and the others are ignored. -#merge_multiple_cli_flags = False - -# Controls showing custom stats at the end, off by default -#show_custom_stats = True - -# Controlls which files to ignore when using a directory as inventory with -# possibly multiple sources (both static and dynamic) -#inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo - -# This family of modules use an alternative execution path optimized for network appliances -# only update this setting if you know how this works, otherwise it can break module execution -#network_group_modules=['eos', 'nxos', 'ios', 'iosxr', 'junos', 'vyos'] - -# This keeps facts from polluting the main namespace as variables. -# Setting to True keeps them under the ansible_facts namespace, the default is False -#restrict_facts_namespace: True - -[privilege_escalation] -#become=True -#become_method=sudo -#become_user=root -#become_ask_pass=False - -[paramiko_connection] - -# uncomment this line to cause the paramiko connection plugin to not record new host -# keys encountered. Increases performance on new host additions. Setting works independently of the -# host key checking setting above. -#record_host_keys=False - -# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this -# line to disable this behaviour. -#pty=False - -# paramiko will default to looking for SSH keys initially when trying to -# authenticate to remote devices. This is a problem for some network devices -# that close the connection after a key failure. Uncomment this line to -# disable the Paramiko look for keys function -#look_for_keys = False - -# When using persistent connections with Paramiko, the connection runs in a -# background process. If the host doesn't already have a valid SSH key, by -# default Ansible will prompt to add the host key. This will cause connections -# running in background processes to fail. Uncomment this line to have -# Paramiko automatically add host keys. -#host_key_auto_add = True - -[ssh_connection] - -# ssh arguments to use -# Leaving off ControlPersist will result in poor performance, so use -# paramiko on older platforms rather than removing it, -C controls compression use -#ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s - -# The base directory for the ControlPath sockets. -# This is the "%(directory)s" in the control_path option -# -# Example: -# control_path_dir = /tmp/.ansible/cp -#control_path_dir = ~/.ansible/cp - -# The path to use for the ControlPath sockets. This defaults to a hashed string of the hostname, -# port and username (empty string in the config). The hash mitigates a common problem users -# found with long hostames and the conventional %(directory)s/ansible-ssh-%%h-%%p-%%r format. -# In those cases, a "too long for Unix domain socket" ssh error would occur. -# -# Example: -# control_path = %(directory)s/%%h-%%r -#control_path = - -# Enabling pipelining reduces the number of SSH operations required to -# execute a module on the remote server. This can result in a significant -# performance improvement when enabled, however when using "sudo:" you must -# first disable 'requiretty' in /etc/sudoers -# -# By default, this option is disabled to preserve compatibility with -# sudoers configurations that have requiretty (the default on many distros). -# -#pipelining = False - -# Control the mechanism for transferring files (old) -# * smart = try sftp and then try scp [default] -# * True = use scp only -# * False = use sftp only -#scp_if_ssh = smart - -# Control the mechanism for transferring files (new) -# If set, this will override the scp_if_ssh option -# * sftp = use sftp to transfer files -# * scp = use scp to transfer files -# * piped = use 'dd' over SSH to transfer files -# * smart = try sftp, scp, and piped, in that order [default] -#transfer_method = smart - -# if False, sftp will not use batch mode to transfer files. This may cause some -# types of file transfer failures impossible to catch however, and should -# only be disabled if your sftp version has problems with batch mode -#sftp_batch_mode = False - -[persistent_connection] - -# Configures the persistent connection timeout value in seconds. This value is -# how long the persistent connection will remain idle before it is destroyed. -# If the connection doesn't receive a request before the timeout value -# expires, the connection is shutdown. The default value is 30 seconds. -#connect_timeout = 30 - -# Configures the persistent connection retries. This value configures the -# number of attempts the ansible-connection will make when trying to connect -# to the local domain socket. The default value is 30. -#connect_retries = 30 - -# Configures the amount of time in seconds to wait between connection attempts -# to the local unix domain socket. This value works in conjunction with the -# connect_retries value to define how long to try to connect to the local -# domain socket when setting up a persistent connection. The default value is -# 1 second. -#connect_interval = 1 - -[accelerate] -#accelerate_port = 5099 -#accelerate_timeout = 30 -#accelerate_connect_timeout = 5.0 - -# The daemon timeout is measured in minutes. This time is measured -# from the last activity to the accelerate daemon. -#accelerate_daemon_timeout = 30 - -# If set to yes, accelerate_multi_key will allow multiple -# private keys to be uploaded to it, though each user must -# have access to the system via SSH to add a new key. The default -# is "no". -#accelerate_multi_key = yes - -[selinux] -# file systems that require special treatment when dealing with security context -# the default behaviour that copies the existing context or uses the user default -# needs to be changed to use the file system dependent context. -#special_context_filesystems=nfs,vboxsf,fuse,ramfs,9p - -# Set this to yes to allow libvirt_lxc connections to work without SELinux. -#libvirt_lxc_noseclabel = yes - -[colors] -#highlight = white -#verbose = blue -#warn = bright purple -#error = red -#debug = dark gray -#deprecate = purple -#skip = cyan -#unreachable = red -#ok = green -#changed = yellow -#diff_add = green -#diff_remove = red -#diff_lines = cyan - - -[diff] -# Always print diff when running ( same as always running with -D/--diff ) -# always = no - -# Set how many context lines to show in diff -# context = 3 diff --git a/tests/integration/compute.yaml b/tests/integration/compute.yaml deleted file mode 100644 index 4cb71e9f..00000000 --- a/tests/integration/compute.yaml +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################## -# 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: fuel-master - gather_facts: no - tasks: - - name: collect facts of fuel hosts - fuel: - - name: add compute node to ansible inventory - add_host: - name: "{{ hosts_meta[item]['ip'] }}" - groups: compute - ansible_user: root - ansible_ssh_common_args: '-o StrictHostKeyChecking=No -o ProxyJump=fuel-master' - with_items: "{{ hosts.compute }}" -- hosts: compute - tasks: - - name: check ssh connection - ping: - - include: tasks/inxi.yaml -- hosts: local - tasks: - - name: create system information report - local_action: template src=templates/inxi-system-info.j2 dest=reports/inxi-system-info - delegate_to: localhost diff --git a/tests/integration/fixtures/case.json b/tests/integration/fixtures/case.json new file mode 100644 index 00000000..22abc40f --- /dev/null +++ b/tests/integration/fixtures/case.json @@ -0,0 +1,14 @@ +{ + "run": "", + "name": "compute", + "ci_loop": "", + "tags": "", + "url": "", + "domains": "", + "dependencies": "", + "version": "", + "criteria": "", + "tier": "", + "blocking": "", + "description": "" +}
\ No newline at end of file diff --git a/tests/integration/fixtures/pod.json b/tests/integration/fixtures/pod.json new file mode 100644 index 00000000..8c2863ba --- /dev/null +++ b/tests/integration/fixtures/pod.json @@ -0,0 +1,6 @@ +{ + "details": "", + "role": "", + "name": "internal", + "mode": "" +}
\ No newline at end of file diff --git a/tests/integration/fixtures/project.json b/tests/integration/fixtures/project.json new file mode 100644 index 00000000..ecd03e83 --- /dev/null +++ b/tests/integration/fixtures/project.json @@ -0,0 +1,4 @@ +{ + "name": "qtip", + "description": "Platform Performance Benchmarking" +}
\ No newline at end of file diff --git a/tests/integration/group_vars/all b/tests/integration/group_vars/all new file mode 100644 index 00000000..16a93f46 --- /dev/null +++ b/tests/integration/group_vars/all @@ -0,0 +1,3 @@ +qtip_resources: ../../resources +qtip_reports: ./reports +qtip_fixtures: ./fixtures diff --git a/tests/integration/host_vars/localhost b/tests/integration/host_vars/localhost new file mode 100644 index 00000000..18d764cc --- /dev/null +++ b/tests/integration/host_vars/localhost @@ -0,0 +1,7 @@ +testapi_url: http://localhost:8000/api/v1 +project_name: qtip +case_name: compute +pod_name: internal +installer: fuel +version: master +scenario: demo diff --git a/tests/integration/hosts b/tests/integration/hosts.default index 9b91eea6..9b91eea6 100644 --- a/tests/integration/hosts +++ b/tests/integration/hosts.default diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml new file mode 100644 index 00000000..7545a65e --- /dev/null +++ b/tests/integration/run.yaml @@ -0,0 +1,80 @@ +############################################################################## +# 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 +############################################################################## + +--- +# Execute compute benchmark plan and collect data +# - system information +# - test condition +# - performance metrics +- hosts: compute + tasks: + - name: check ssh connection + ping: + - name: collect system information + include: "{{ qtip_resources }}/metric/inxi.yaml" + - name: ssl metrics + include: "{{ qtip_resources }}/metric/openssl.yaml" + tags: [ssl] + +- hosts: compute + tasks: + - name: calculate QPI of compute + calculate: + metrics: + ssl_rsa: "{{ openssl_rsa_metrics }}" + spec: "{{ qtip_resources }}/QPI/compute.yaml" + register: qpi_result + delegate_to: localhost + tags: [calculate] + +- hosts: local + tasks: + - name: aggregate QPI results from all tested nodes + aggregate: + group: compute + register: pod_result + +# Generate and publish report + +- hosts: local + tasks: + - name: create report folder + file: + path: "{{ qtip_reports }}" + state: directory + - name: create system information report + template: + src: "{{ qtip_resources }}/template/system-info.j2" + dest: "{{ qtip_reports }}/system-info" + - name: create qpi report + template: + src: "{{ qtip_resources }}/template/qpi-report.j2" + dest: "{{ qtip_reports }}/qpi-report" + tags: [report] + - name: push result to testapi + uri: + url: "{{ testapi_url }}/results" + body: "{{ item|to_json }}" + method: POST + body_format: json + status_code: 200 + with_items: + - + project_name: "{{ project_name }}" + case_name: "{{ case_name }}" + pod_name: "{{ pod_name }}" + installer: "{{ installer }}" + version: "{{ version }}" + scenario: "{{ scenario }}" + start_date: "{{ ansible_date_time.date }}" + stop_date: "{{ ansible_date_time.date }}" + criteria: "" + details: " {{ pod_result }}" + + tags: [testapi] diff --git a/tests/integration/setup.yaml b/tests/integration/setup.yaml new file mode 100644 index 00000000..8d055c23 --- /dev/null +++ b/tests/integration/setup.yaml @@ -0,0 +1,43 @@ +############################################################################## +# 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 +############################################################################## + +# Prepare connection to SUT (System Under Test) +- hosts: fuel-master + gather_facts: no + tasks: + - name: collect facts of fuel hosts + fuel: + - name: update inventory file + template: src={{ qtip_resources }}/template/hosts.j2 dest=./hosts + delegate_to: localhost + - name: update ssh.cfg file + template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg + delegate_to: localhost + +# Initialize testapi database +- hosts: localhost + tasks: + - name: create project and pod + uri: + url: "{{ testapi_url }}/{{item}}s" + method: POST + body: "{{ lookup('file', '{}/{}.json'.format(qtip_fixtures, item)) }}" + status_code: [200, 403] + body_format: json + with_items: + - project + - pod + - name: create cases + uri: + url: "{{ testapi_url }}/projects/qtip/cases" + method: POST + body: "{{ lookup('file', '{}/case.json'.format(qtip_fixtures)) }}" + status_code: [200, 403] + body_format: json + tags: [testapi] diff --git a/tests/integration/templates/inxi-system-info.j2 b/tests/integration/templates/inxi-system-info.j2 deleted file mode 100644 index 35c8661f..00000000 --- a/tests/integration/templates/inxi-system-info.j2 +++ /dev/null @@ -1,16 +0,0 @@ -System Information from inxi -============================ - -{% for host in groups['compute'] %} -{{ hostvars[host].ansible_hostname }} ------------------------------ - -{{ ('CPU Brand', hostvars[host].inxi_info.cpu[0])|justify }} -{{ ('Disk', hostvars[host].inxi_info.disk[0])|justify }} -{{ ('Host Name', hostvars[host].inxi_info.hostname[0])|justify }} -{{ ('Kernel', hostvars[host].inxi_info.kernel[0])|justify }} -{{ ('Memory', hostvars[host].inxi_info.memory[0])|justify }} -{{ ('Operating System', hostvars[host].inxi_info.os[0])|justify }} -{{ ('Product', hostvars[host].inxi_info.product[0])|justify }} - -{% endfor %} diff --git a/tests/unit/ansible_library/modules/apex_test.py b/tests/unit/ansible_library/modules/apex_test.py new file mode 100644 index 00000000..8a1d0673 --- /dev/null +++ b/tests/unit/ansible_library/modules/apex_test.py @@ -0,0 +1,30 @@ +############################################################### +# Copyright (c) 2017 ZTE Corporation +# +# 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 json +import os + +from qtip.ansible_library.modules import apex + + +def test_generate_inventory(data_root): + baremetal_info = json.load(open(os.path.join(data_root, 'external', + 'apex', 'baremetal_info.json'))) + server_info = json.load(open(os.path.join(data_root, 'external', + 'apex', 'server_info.json'))) + inventory = apex.generate_inventory(baremetal_info, server_info) + assert dict(inventory['hosts']) == { + u'compute': [u'192.0.2.5', u'192.0.2.6'], + u'control': [u'192.0.2.7', u'192.0.2.8', u'192.0.2.9']} + assert dict(inventory['hosts_meta']) == { + u'192.0.2.5': {'ansible_ssh_host': u'192.0.2.5'}, + u'192.0.2.6': {'ansible_ssh_host': u'192.0.2.6'}, + u'192.0.2.7': {'ansible_ssh_host': u'192.0.2.7'}, + u'192.0.2.8': {'ansible_ssh_host': u'192.0.2.8'}, + u'192.0.2.9': {'ansible_ssh_host': u'192.0.2.9'}} diff --git a/tests/unit/ansible_library/plugins/action/calculate_test.py b/tests/unit/ansible_library/plugins/action/calculate_test.py new file mode 100644 index 00000000..3b34d9f5 --- /dev/null +++ b/tests/unit/ansible_library/plugins/action/calculate_test.py @@ -0,0 +1,85 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corp 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.ansible_library.plugins.action import calculate + + +@pytest.fixture() +def metrics(): + return { + "ssl_rsa": { + "rsa_sign": [500], + "rsa_verify": [600] + } + } + + +@pytest.fixture() +def metric_spec(): + return { + "name": "ssl_rsa", + "workloads": [ + {"name": "rsa_sign", "baseline": 500}, + {"name": "rsa_verify", "baseline": 600} + ] + } + + +@pytest.fixture() +def section_spec(metric_spec): + return { + "name": "ssl", + "description": "cryptography and SSL/TLS performance", + "metrics": [metric_spec] + } + + +@pytest.fixture +def qpi_spec(section_spec): + return { + "description": "QTIP Performance Index of compute", + "name": "compute", + "sections": [section_spec] + } + + +@pytest.fixture() +def metric_result(): + return {'score': 1.0, + 'workload_results': [ + {'name': 'rsa_sign', 'score': 1.0}, + {'name': 'rsa_verify', 'score': 1.0}]} + + +@pytest.fixture() +def section_result(metric_result): + return {'score': 1.0, + 'metric_results': [{'name': 'ssl_rsa', 'result': metric_result}]} + + +@pytest.fixture() +def qpi_result(qpi_spec, section_result, metrics): + return {'score': 2048, + 'spec': qpi_spec, + 'metrics': metrics, + 'section_results': [{'name': 'ssl', 'result': section_result}]} + + +def test_calc_metric(metric_spec, metrics, metric_result): + assert calculate.calc_metric(metric_spec, metrics['ssl_rsa']) == metric_result + + +def test_calc_section(section_spec, metrics, section_result): + assert calculate.calc_section(section_spec, metrics) == section_result + + +def test_calc_qpi(qpi_spec, metrics, qpi_result): + assert calculate.calc_qpi(qpi_spec, metrics) == qpi_result diff --git a/tests/unit/cli/cmd_metric_test.py b/tests/unit/cli/cmd_metric_test.py index cd496ad9..c92e944b 100644 --- a/tests/unit/cli/cmd_metric_test.py +++ b/tests/unit/cli/cmd_metric_test.py @@ -41,3 +41,6 @@ def test_show(runner): result = runner.invoke(cli, ['metric', 'show']) assert 'Missing argument "name".' in result.output + + result = runner.invoke(cli, ['metric', 'show', 'xyz']) + assert "ERROR: metric spec: xyz not found" in result.output diff --git a/tests/unit/cli/cmd_plan_test.py b/tests/unit/cli/cmd_plan_test.py index 30025ae0..53a04800 100644 --- a/tests/unit/cli/cmd_plan_test.py +++ b/tests/unit/cli/cmd_plan_test.py @@ -38,3 +38,6 @@ def test_show(runner): result = runner.invoke(cli, ['plan', 'show']) assert 'Missing argument "name".' in result.output + + result = runner.invoke(cli, ['plan', 'show', 'xyz']) + assert "ERROR: plan spec: xyz not found" in result.output diff --git a/tests/unit/cli/cmd_qpi_test.py b/tests/unit/cli/cmd_qpi_test.py index 3d2c2613..e7823c9b 100644 --- a/tests/unit/cli/cmd_qpi_test.py +++ b/tests/unit/cli/cmd_qpi_test.py @@ -38,3 +38,6 @@ def test_show(runner): result = runner.invoke(cli, ['qpi', 'show']) assert 'Missing argument "name".' in result.output + + result = runner.invoke(cli, ['qpi', 'show', 'xyz']) + assert "ERROR: qpi spec: xyz not found" in result.output diff --git a/tests/unit/cli/options_test.py b/tests/unit/cli/options_test.py index 9dbbe6f3..d7c0f700 100644 --- a/tests/unit/cli/options_test.py +++ b/tests/unit/cli/options_test.py @@ -8,6 +8,7 @@ ############################################################################## import pytest +import re import sys from click.testing import CliRunner @@ -26,7 +27,7 @@ class TestClass(object): def test_version(self, runner): result = runner.invoke(cli, ['--version']) - assert 'dev' in result.output + assert re.search(r'\d+\.\d+\.\d+', result.output) def test_debug(self, runner): runner.invoke(cli, ['-d']) |