diff options
43 files changed, 1265 insertions, 222 deletions
@@ -1,6 +1,6 @@ -QTIP is a performance benchmark service for OPNFV platform +QTIP provides Benchmarking as a Service for OPNFV community -QTIP aims to benchmark OPNFV platforms through a "Bottom up" approach. Emphasis -on platform performance through quantitative benchmarks rather than validation. +[ ](https://app.codeship.com/projects/222465) See [project wiki](https://wiki.opnfv.org/display/qtip) for more information. + diff --git a/docs/testing/user/userguide/getting-started.rst b/docs/testing/user/userguide/getting-started.rst new file mode 100644 index 00000000..8289a9c2 --- /dev/null +++ b/docs/testing/user/userguide/getting-started.rst @@ -0,0 +1,60 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 + +************************* +Getting started with QTIP +************************* + +Overview +======== + +Create a new project to hold the neccessary configurations and test results +:: + + qtip create <project_name> + +The user would be prompted for OPNFV installer, its hostname etc +:: + + **Pod Name [unknown]: zte-pod1** + User's choice to name OPNFV Pod + + **OPNFV Installer [manual]: fuel** + QTIP currently supports fuel and apex only + + **Installer Hostname [dummy-host]: master** + The hostname for the fuel or apex installer node. The same hostname can be added to **~/.ssh/config** file of current user, + if there are problems resolving the hostname via interactive input. + + **OPNFV Scenario [unknown]: os-nosdn-nofeature-ha** + Depends on the OPNFV scenario deployed + +With the framework generated, user should now proceed on to setting up testing environment. In this step, information related to OPNFV cluster would +be generated, such as getting the IP addresses of the nodes in System Under Test (SUT). +:: + + cd <project_name> + $ qtip setup + +QTIP uses `ssh-agent` for authentication. It is critical that it started and stopped in the correct way. + + +ssh-agent +========= + +ssh-agent is used to hold the private keys for RSA, DCA authentication. In order to start the process +:: + + $ eval $(ssh-agent) + +This would start the agent in background. One must now be able to execute QTIP +:: + + $ qtip run + +However, if QTIP is not working because of `ssh-agent`, one should kill the process as follows +:: + + $ eval $(ssh-agent -k) + +Then start the agent again as described above. diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst index d0d555f8..9b6ab888 100644 --- a/docs/testing/user/userguide/index.rst +++ b/docs/testing/user/userguide/index.rst @@ -15,3 +15,4 @@ QTIP User Guide cli.rst api.rst compute.rst + getting-started.rst diff --git a/qtip/ansible_library/plugins/action/aggregate.py b/qtip/ansible_library/plugins/action/aggregate.py index f1451e06..36ea0ef1 100644 --- a/qtip/ansible_library/plugins/action/aggregate.py +++ b/qtip/ansible_library/plugins/action/aggregate.py @@ -42,9 +42,15 @@ class ActionModule(ActionBase): # aggregate QPI results @export_to_file def aggregate(hosts, basepath, src): - host_results = [{'host': host, 'result': json.load(open(os.path.join(basepath, host, src)))} for host in hosts] - score = int(mean([r['result']['score'] for r in host_results])) + host_results = [] + for host in hosts: + host_result = json.load(open(os.path.join(basepath, host, src))) + host_result['name'] = host + host_results.append(host_result) + score = int(mean([r['score'] for r in host_results])) return { 'score': score, - 'host_results': host_results + 'name': 'compute', + 'description': 'POD Compute QPI', + 'children': host_results } diff --git a/qtip/ansible_library/plugins/action/calculate.py b/qtip/ansible_library/plugins/action/calculate.py index 8d5fa1f7..077d863c 100644 --- a/qtip/ansible_library/plugins/action/calculate.py +++ b/qtip/ansible_library/plugins/action/calculate.py @@ -55,18 +55,22 @@ def calc_qpi(qpi_spec, metrics): display.vvv("spec: {}".format(qpi_spec)) display.vvv("metrics: {}".format(metrics)) - section_results = [{'name': s['name'], 'result': calc_section(s, metrics)} + section_results = [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) + qpi_score = int(mean([r['score'] for r in section_results]) * standard_score) results = { - 'spec': qpi_spec, 'score': qpi_score, - 'section_results': section_results, - 'metrics': metrics + 'name': qpi_spec['name'], + 'description': qpi_spec['description'], + 'children': section_results, + 'details': { + 'metrics': metrics, + 'spec': "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml" + } } return results @@ -78,13 +82,15 @@ def calc_section(section_spec, metrics): display.vvv("spec: {}".format(section_spec)) display.vvv("metrics: {}".format(metrics)) - metric_results = [{'name': m['name'], 'result': calc_metric(m, metrics[m['name']])} + metric_results = [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]) + section_score = mean([r['score'] for r in metric_results]) return { 'score': section_score, - 'metric_results': metric_results + 'name': section_spec['name'], + 'description': section_spec.get('description', 'section'), + 'children': metric_results } @@ -95,12 +101,16 @@ def calc_metric(metric_spec, metrics): display.vvv("metrics: {}".format(metrics)) # TODO(yujunz): use formula in spec - workload_results = [{'name': w['name'], 'score': calc_score(metrics[w['name']], w['baseline'])} + workload_results = [{'name': w['name'], + 'description': 'workload', + 'score': calc_score(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 + 'name': metric_spec['name'], + 'description': metric_spec.get('description', 'metric'), + 'children': workload_results } diff --git a/qtip/cli/commands/cmd_plan.py b/qtip/cli/commands/cmd_plan.py deleted file mode 100644 index b7c540b7..00000000 --- a/qtip/cli/commands/cmd_plan.py +++ /dev/null @@ -1,69 +0,0 @@ -############################################################################## -# Copyright (c) 2016 taseer94@gmail.com 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 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 - - -pass_context = click.make_pass_decorator(Context, ensure=False) - - -@click.group() -@pass_context -def cli(ctx): - ''' Bechmarking Plan ''' - pass - - -@cli.command('init', help='Initialize Environment') -@pass_context -def init(ctx): - pass - - -@cli.command('list', help='List the Plans') -@pass_context -def list(ctx): - plans = Plan.list_all() - table = utils.table('Plans', plans) - click.echo(table) - - -@cli.command('show', help='View details of a Plan') -@click.argument('name') -@pass_context -def show(ctx, name): - 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') -@click.argument('name') -@click.option('-p', '--path', help='Path to store results') -@pass_context -def run(ctx, name, path): - runner_path = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir, - 'runner/runner.py') - os.system('python {0} -b all -d {1}'.format(runner_path, path)) diff --git a/qtip/cli/commands/cmd_project.py b/qtip/cli/commands/cmd_project.py index 740fb1c4..f7ac3a83 100644 --- a/qtip/cli/commands/cmd_project.py +++ b/qtip/cli/commands/cmd_project.py @@ -39,12 +39,22 @@ def cli(): @cli.command(help="Create new testing project") -@click.option('--pod', default='unknown', help='Name of pod under test') -@click.option('--installer', help='OPNFV installer', default='manual') -@click.option('--master-host', help='Installer hostname', default='dummy-host') -@click.option('--scenario', default='unknown', help='OPNFV scenario') +@click.option('--template', + prompt='Choose project template', + type=click.Choice(['compute', 'doctor']), + default='compute', + help='Choose project template') +@click.option('--pod', default='unknown', prompt='Pod Name', + help='Name of pod under test') +@click.option('--installer', prompt='OPNFV Installer', + help='OPNFV installer', default='manual') +@click.option('--master-host', prompt='Installer Hostname', + help='Installer hostname', default='dummy-host') +@click.option('--scenario', prompt='OPNFV Scenario', default='unknown', + help='OPNFV scenario') @click.argument('name') -def create(pod, installer, master_host, scenario, name): +def create(pod, installer, master_host, scenario, name, template): + qtip_generator_role = os.path.join(utils.QTIP_ANSIBLE_ROLES, 'qtip-generator') extra_vars = { 'qtip_package': utils.QTIP_PACKAGE, 'cwd': os.getcwd(), @@ -52,14 +62,16 @@ def create(pod, installer, master_host, scenario, name): 'installer': installer, 'scenario': scenario, 'installer_master_host': master_host, - 'workspace': name + 'project_name': name, + 'project_template': template } - os.system("ANSIBLE_ROLES_PATH={qtip_package}/{roles_path} ansible-playbook" - " -i {qtip_package}/{roles_path}/qtip-workspace/hosts" - " {qtip_package}/{roles_path}/qtip-workspace/create.yml" + os.system("ANSIBLE_ROLES_PATH={roles_path} ansible-playbook" + " -i {hosts}" + " {playbook}" " --extra-vars '{extra_vars}'" - "".format(qtip_package=utils.QTIP_PACKAGE, - roles_path=utils.ROLES_PATH, + "".format(roles_path=utils.QTIP_ANSIBLE_ROLES, + hosts=os.path.join(qtip_generator_role, 'hosts'), + playbook=os.path.join(qtip_generator_role, 'main.yml'), extra_vars=utils.join_vars(**extra_vars))) diff --git a/qtip/cli/utils.py b/qtip/cli/utils.py index 832e5ba9..0f0e7e95 100644 --- a/qtip/cli/utils.py +++ b/qtip/cli/utils.py @@ -15,7 +15,7 @@ from prettytable import PrettyTable QTIP_PACKAGE = path.join(path.dirname(__file__), os.pardir, os.pardir) -ROLES_PATH = 'resources/ansible_roles' +QTIP_ANSIBLE_ROLES = path.join(QTIP_PACKAGE, 'resources', 'ansible_roles') def join_vars(**kwargs): diff --git a/resources/QPI/compute-baseline.json b/resources/QPI/compute-baseline.json new file mode 100644 index 00000000..25378d10 --- /dev/null +++ b/resources/QPI/compute-baseline.json @@ -0,0 +1,173 @@ +{ + "name": "compute-baseline", + "description": "The baseline for compute QPI", + "version": "0.0.1", + "score": 2048, + "spec": "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml", + "system_info": { + "product": "EC600G3", + "cpu": "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-)", + "os": "Ubuntu 16.04 xenial", + "kernel": "4.4.0-72-generic x86_64 (64 bit)" + }, + "condition": { + "cpu_speed": "1200/3000 MHz", + "memory": "4062.3/128524.1MB", + "disk": "1200.3GB (0.9% used)", + "installer": "Fuel", + "scenario": "os-nosdn-nofeature-ha" + }, + "sections": [ + { + "name": "SSL", + "metrics": [ + { + "name": "ssl_rsa", + "workloads": [ + { + "name": "rsa_sign_512", + "baseline": "16521.0" + }, + { + "name": "rsa_verify_512", + "baseline": "223925.9" + }, + { + "name": "rsa_sign_1024", + "baseline": "5802.6" + }, + { + "name": "rsa_verify_1024", + "baseline": "89015.3" + }, + { + "name": "rsa_sign_2048", + "baseline": "1236.5" + }, + { + "name": "rsa_verify_2048", + "baseline": "27919.2" + }, + { + "name": "rsa_sign_4096", + "baseline": "114.9" + }, + { + "name": "rsa_verify_4096", + "baseline": "8637.9" + } + ] + }, + { + "name": "ssl_aes", + "workloads": [ + { + "name": "aes_128_cbc_16_bytes", + "baseline": "544031.31k" + }, + { + "name": "aes_128_cbc_64_bytes", + "baseline": "575116.35k" + }, + { + "name": "aes_128_cbc_256_bytes", + "baseline": "587653.72k" + }, + { + "name": "aes_128_cbc_1024_bytes", + "baseline": "595095.21k" + }, + { + "name": "aes_128_cbc_8192_bytes", + "baseline": "590107.99k" + } + ] + } + ] + }, + { + "name": "DPI", + "metrics": [ + { + "name": "dpi_throughput", + "workloads": [ + { + "name": "dpi_pps", + "baseline": "2.42 M" + }, + { + "name": "dpi_bps", + "baseline": "22.70 G" + } + ] + } + ] + }, + { + "name": "memory", + "metrics": [ + { + "name": "floatmem", + "workloads": [ + { + "name": "triad", + "baseline": "10215.75" + }, + { + "name": "add", + "baseline": "10117.36" + }, + { + "name": "copy", + "baseline": "8168.85" + }, + { + "name": "scale", + "baseline": "8119.82" + } + ] + }, + { + "name": "intmem", + "workloads": [ + { + "name": "triad", + "baseline": "12153.15" + }, + { + "name": "add", + "baseline": "12302.58" + }, + { + "name": "copy", + "baseline": "12194.48" + }, + { + "name": "scale", + "baseline": "12187.15" + } + ] + } + ] + }, + { + "name": "arithmetic", + "metrics": [ + { + "name": "arithmetic", + "workloads": [ + { + "name": "dhrystone_lps", + "baseline": "29002911.0" + }, + { + "name": "whetstone_MWIPS", + "baseline": "2176.8" + } + ] + + } + ] + } + ] +} diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml index bc4e8ab2..d27d769b 100644 --- a/resources/QPI/compute.yaml +++ b/resources/QPI/compute.yaml @@ -18,7 +18,6 @@ sections: # split based on different application formual: geometric mean workloads: - name: rsa_sign_512 - description: RSA signature 512 bits baseline: 14982.3 - name: rsa_verify_512 baseline: 180619.2 diff --git a/resources/ansible_roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml index f6216df4..1050c9be 100644 --- a/resources/ansible_roles/inxi/tasks/main.yml +++ b/resources/ansible_roles/inxi/tasks/main.yml @@ -42,7 +42,7 @@ patterns: - '.+\s+Host:\s+(?P<hostname>.+)\sKernel' - '.+\sMemory:\s+(?P<memory>.+MB)\s' - - '^CPU\(s\):\s+(?P<cpu>.+)' + - '^CPU\(s\):\s+(?P<cpu>.+)\sspeed\/max' - '.+\sDistro:\s+(?P<os>.+)' - '.+\sKernel:\s+(?P<kernel>.+)\sConsole' - '.+\s+HDD Total Size:\s+(?P<disk>.+)\s' diff --git a/resources/ansible_roles/inxi/templates/system-info.j2 b/resources/ansible_roles/inxi/templates/system-info.j2 index 305a2af2..2108a979 100644 --- a/resources/ansible_roles/inxi/templates/system-info.j2 +++ b/resources/ansible_roles/inxi/templates/system-info.j2 @@ -1,16 +1,10 @@ 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 %} +{{ ('CPU Brand', system_info.cpu[0])|justify }} +{{ ('Disk', system_info.disk[0])|justify }} +{{ ('Host Name', system_info.hostname[0])|justify }} +{{ ('Kernel', system_info.kernel[0])|justify }} +{{ ('Memory', system_info.memory[0])|justify }} +{{ ('Operating System', system_info.os[0])|justify }} +{{ ('Product', system_info.product[0])|justify }} diff --git a/resources/ansible_roles/qtip-workspace/ansible.cfg b/resources/ansible_roles/qtip-generator/ansible.cfg index 872941bd..872941bd 100644 --- a/resources/ansible_roles/qtip-workspace/ansible.cfg +++ b/resources/ansible_roles/qtip-generator/ansible.cfg diff --git a/resources/ansible_roles/qtip-workspace/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml index 7f6407d3..846b5169 100644 --- a/resources/ansible_roles/qtip-workspace/defaults/main.yml +++ b/resources/ansible_roles/qtip-generator/defaults/main.yml @@ -16,7 +16,9 @@ installer_master_group: fuel: fuel-masters apex: apex-underclouds -workspace: "workspace" +project_name: 'qtip-project' +project_template: 'compute' + qtip_package: ../../.. qtip_cache: .qtip-cache cwd: . diff --git a/resources/ansible_roles/qtip-workspace/files/template/ansible.cfg b/resources/ansible_roles/qtip-generator/files/compute/ansible.cfg index a80d4ae4..a80d4ae4 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/ansible.cfg +++ b/resources/ansible_roles/qtip-generator/files/compute/ansible.cfg diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/case.json index 22abc40f..22abc40f 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json +++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/case.json diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/pod.json index 654b5828..654b5828 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json +++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/pod.json diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/project.json index ecd03e83..ecd03e83 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json +++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/project.json diff --git a/resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml index 3d41e1b4..3d41e1b4 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml diff --git a/resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml index 815e2ea3..815e2ea3 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml diff --git a/resources/ansible_roles/qtip-workspace/files/template/hosts b/resources/ansible_roles/qtip-generator/files/compute/hosts index b8b256a9..b8b256a9 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/hosts +++ b/resources/ansible_roles/qtip-generator/files/compute/hosts diff --git a/resources/ansible_roles/qtip-workspace/files/template/run.yml b/resources/ansible_roles/qtip-generator/files/compute/run.yml index f8e71f0c..f8e71f0c 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/run.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/run.yml diff --git a/resources/ansible_roles/qtip-workspace/files/template/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml index d165a9fe..d165a9fe 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/setup.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml diff --git a/resources/ansible_roles/qtip-workspace/files/template/teardown.yml b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml index dc659930..dc659930 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/teardown.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts index 492651b0..34e4aa92 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts +++ b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts @@ -4,7 +4,7 @@ localhost ansible_connection=local [{{ installer_master_group[installer] }}] {{ installer_master_host }} -[SUT] # system under test +[SUT:children] # system under test compute [node-groups:children] diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg index 67246054..67246054 100644 --- a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg +++ b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg diff --git a/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg b/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg new file mode 100644 index 00000000..8dbd12a5 --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg @@ -0,0 +1,466 @@ +{% raw %} +# config file for ansible -- https://ansible.com/ +# =============================================== + +# nearly all parameters can be overridden in ansible-playbook +# or with command line flags. ansible will read ANSIBLE_CONFIG, +# ansible.cfg in the current working directory, .ansible.cfg in +# the home directory or /etc/ansible/ansible.cfg, whichever it +# finds first + +[defaults] + +# some basic default values... + +inventory = hosts +#library = /usr/share/my_modules/ +#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, you can only have one 'stdout' type enabled at a time. +#stdout_callback = skippy + +## Ansible ships with some plugins that require whitelisting, +## this is done to avoid running all of a type by default. +## These setting lists those that you want enabled for your system. +## Custom plugins should not need this unless plugin author specifies it. + +# enable callback plugins, they can output to stdout but cannot be 'stdout' type. +#callback_whitelist = timer, mail + +# enable inventory plugins, default: 'host_list', 'script', 'ini', 'yaml' +#inventory_enabled = host_list, aws, openstack, docker + +# 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 = /usr/share/ansible/plugins/action +#cache_plugins = /usr/share/ansible/plugins/cache +#callback_plugins = /usr/share/ansible/plugins/callback +#connection_plugins = /usr/share/ansible/plugins/connection +#lookup_plugins = /usr/share/ansible/plugins/lookup +#inventory_plugins = /usr/share/ansible/plugins/inventory +#vars_plugins = /usr/share/ansible/plugins/vars +#filter_plugins = /usr/share/ansible/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. +# This option will be removed in 2.8. +#merge_multiple_cli_flags = True + +# Controls showing custom stats at the end, off by default +#show_custom_stats = True + +# Controls 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 + +# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as +# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain +# jinja2 templating language which will be run through the templating engine. +# ENABLING THIS COULD BE A SECURITY RISK +#allow_unsafe_lookups = False + +[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 +{% endraw %}
\ No newline at end of file diff --git a/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml new file mode 100644 index 00000000..55d5b250 --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml @@ -0,0 +1,14 @@ +{% raw %} +doctor_project: doctor +doctor_user: doctor +doctor_pass: doctor +doctor_role: _member_ +doctor_domain: Default +doctor_network: doctor +doctor_subnet: doctor +doctor_cidr: "192.168.168.0/24" +doctor_auth: + username: "{{ doctor_user }}" + password: "{{ doctor_pass }}" + project_name: "{{ doctor_project }}" +{% endraw %} diff --git a/resources/ansible_roles/qtip-generator/files/doctor/hosts b/resources/ansible_roles/qtip-generator/files/doctor/hosts new file mode 100644 index 00000000..57b7932d --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/doctor/hosts @@ -0,0 +1,2 @@ +[doctor-tester] +localhost ansible_connection=local diff --git a/resources/ansible_roles/qtip-generator/files/doctor/setup.yml b/resources/ansible_roles/qtip-generator/files/doctor/setup.yml new file mode 100644 index 00000000..2a1f868d --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/doctor/setup.yml @@ -0,0 +1,56 @@ +{% raw %} +############################################################################## +# 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: doctor-tester + + gather_facts: no + + tasks: + + - name: creating doctor project + os_project: + name: "{{ doctor_project }}" + description: test project for doctor verification + domain: "{{ doctor_domain }}" + enabled: true + + - name: creating doctor user + os_user: + name: "{{ doctor_user }}" + password: "{{ doctor_pass }}" + domain: "{{ doctor_domain }}" + default_project: "{{ doctor_project }}" + + - name: assigning role to doctor user + os_user_role: + user: "{{ doctor_user }}" + role: "{{ doctor_role }}" + project: "{{ doctor_project }}" + + - name: adding admin user to doctor project + os_user_role: + user: admin + role: admin + project: "{{ doctor_project }}" + + - name: creating doctor network + os_network: + auth: "{{ doctor_auth }}" + name: "{{ doctor_network }}" + + - name: creating doctor subnet + os_subnet: + auth: "{{ doctor_auth }}" + name: "{{ doctor_subnet }}" + cidr: "{{ doctor_cidr }}" + network_name: "{{ doctor_network }}" + enable_dhcp: false +{% endraw %}
\ No newline at end of file diff --git a/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml b/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml new file mode 100644 index 00000000..7e21d5d2 --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml @@ -0,0 +1,40 @@ +{% raw %} +############################################################################## +# 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 + + gather_facts: no + + tasks: + + # Reverse order of setup + - name: removing doctor subnet + os_subnet: + auth: "{{ doctor_auth }}" + name: "{{ doctor_subnet }}" + state: absent + + - name: creating doctor network + os_network: + auth: "{{ doctor_auth }}" + name: "{{ doctor_network }}" + state: absent + + - name: removing doctor user + os_user: + name: "{{ doctor_user }}" + state: absent + + - name: removing doctor project + os_project: + name: "{{ doctor_project }}" + state: absent +{% endraw %} diff --git a/resources/ansible_roles/qtip-workspace/hosts b/resources/ansible_roles/qtip-generator/hosts index 2302edae..2302edae 100644 --- a/resources/ansible_roles/qtip-workspace/hosts +++ b/resources/ansible_roles/qtip-generator/hosts diff --git a/resources/ansible_roles/qtip-generator/main.yml b/resources/ansible_roles/qtip-generator/main.yml new file mode 100644 index 00000000..2080e81f --- /dev/null +++ b/resources/ansible_roles/qtip-generator/main.yml @@ -0,0 +1,17 @@ +############################################################################## +# 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 + + gather_facts: no + + roles: + + - role: qtip-generator diff --git a/resources/ansible_roles/qtip-workspace/tasks/main.yml b/resources/ansible_roles/qtip-generator/tasks/main.yml index 4fa60061..5188e0a8 100644 --- a/resources/ansible_roles/qtip-workspace/tasks/main.yml +++ b/resources/ansible_roles/qtip-generator/tasks/main.yml @@ -9,16 +9,16 @@ - name: creating directories file: - path: "{{ cwd }}/{{ workspace }}/{{ item.path }}" + path: "{{ cwd }}/{{ project_name }}/{{ item.path }}" state: directory force: yes - with_filetree: template/ + with_filetree: "{{ project_template }}/" when: item.state == 'directory' - name: templating files template: src: "{{ item.src }}" - dest: "{{ cwd }}/{{ workspace }}/{{ item.path }}" + dest: "{{ cwd }}/{{ project_name }}/{{ item.path }}" force: yes - with_filetree: template/ + with_filetree: "{{ project_template }}/" when: item.state == 'file' diff --git a/resources/ansible_roles/qtip-workspace/create.yml b/resources/ansible_roles/qtip-workspace/create.yml deleted file mode 100644 index 4b06ebfa..00000000 --- a/resources/ansible_roles/qtip-workspace/create.yml +++ /dev/null @@ -1,41 +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: localhost - - gather_facts: no - - roles: - - - role: qtip-workspace - - # modify or override variables to customize the workspace - - # opnfv environment - -# installer: apex # <fuel|apex> -# installer_master_host: apex-virtual # make sure you can login it with key authentication - - # set testapi_url to enable reportint to testapi - -# testapi_url: http://localhost:8000/api/v1 - - # report variables - -# project_name: qtip -# case_name: compute -# pod_name: "{{ pod_name|default('qtip-pod') }}" -# scenario: "{{ scenario|default('generic') }}" -# version: master -# scenario: demo - - # qtip settings - - qtip_package: ../../.. # relative path from **workspace**, not current directory diff --git a/resources/ansible_roles/qtip/tasks/aggregate.yml b/resources/ansible_roles/qtip/tasks/aggregate.yml index 9ecdc700..904fc5d6 100644 --- a/resources/ansible_roles/qtip/tasks/aggregate.yml +++ b/resources/ansible_roles/qtip/tasks/aggregate.yml @@ -14,5 +14,10 @@ group: compute basepath: "{{ qtip_results }}/current" src: "compute.json" - dest: "{{ pod_name }}-qpi.json" + dest: "qpi.json" register: pod_result + +- name: generating HTML report + template: + src: "{{ qtip_resources }}/template/qpi.html.j2" + dest: "{{ qtip_results }}/current/index.html" diff --git a/resources/ansible_roles/ramspeed/templates/memory-metrics.j2 b/resources/ansible_roles/ramspeed/templates/memory-metrics.j2 index 4f5a8e80..871a7127 100644 --- a/resources/ansible_roles/ramspeed/templates/memory-metrics.j2 +++ b/resources/ansible_roles/ramspeed/templates/memory-metrics.j2 @@ -11,6 +11,6 @@ INTEGER FL-POINT ^^^^^^^^ {{ ('Copy', floatmem_metrics['copy'][0])|justify }} -{{ ('Scale', floatmem_metrics['copy'][0])|justify }} -{{ ('Add', floatmem_metrics['copy'][0])|justify }} -{{ ('Triad', floatmem_metrics['copy'][0])|justify }} +{{ ('Scale', floatmem_metrics['scale'][0])|justify }} +{{ ('Add', floatmem_metrics['add'][0])|justify }} +{{ ('Triad', floatmem_metrics['triad'][0])|justify }} diff --git a/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 index a12eb0ab..c2c4c3b2 100644 --- a/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 +++ b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 @@ -1,5 +1,5 @@ Arithmetic ========== -{{ ('Floating-point (Whetstone MWIPS)', arithmetic_metrics.dhrystone_lps[0])|justify }} -{{ ('Integer (Dhyrstone lps)', arithmetic_metrics.whetstone_MWIPS[0])|justify }} +{{ ('Floating-point (Whetstone MWIPS)', arithmetic_metrics.whetstone_MWIPS[0])|justify }} +{{ ('Integer (Dhyrstone lps)', arithmetic_metrics.dhrystone_lps[0])|justify }} diff --git a/resources/template/qpi.html.j2 b/resources/template/qpi.html.j2 new file mode 100644 index 00000000..3515676a --- /dev/null +++ b/resources/template/qpi.html.j2 @@ -0,0 +1,323 @@ +<!DOCTYPE html> +<meta charset="utf-8"> +<style> + + circle, + path { + cursor: pointer; + } + + circle { + fill: none; + pointer-events: all; + } + + #tooltip { + background-color: white; + padding: 3px 5px; + border: 1px solid black; + text-align: center; + } + + html { + font-family: sans-serif; + + } +</style> +<body> +<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.17/d3.min.js"></script> +<script> + + var margin = {top: 350, right: 480, bottom: 350, left: 480}, + radius = Math.min(margin.top, margin.right, margin.bottom, margin.left) - 10; + + function filter_min_arc_size_text(d, i) { + return (d.dx * d.depth * radius / 3) > 14 + }; + + var hue = d3.scale.category10(); + + var luminance = d3.scale.sqrt() + .domain([0, 1e6]) + .clamp(true) + .range([90, 20]); + + var svg = d3.select("body").append("svg") + .attr("width", margin.left + margin.right) + .attr("height", margin.top + margin.bottom) + .append("g") + .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); + + var partition = d3.layout.partition() + .sort(function (a, b) { + return d3.ascending(a.name, b.name); + }) + .size([2 * Math.PI, radius]); + + var arc = d3.svg.arc() + .startAngle(function (d) { + return d.x; + }) + .endAngle(function (d) { + return d.x + d.dx - .01 / (d.depth + .5); + }) + .innerRadius(function (d) { + return radius / 3 * d.depth; + }) + .outerRadius(function (d) { + return radius / 3 * (d.depth + 1) - 1; + }); + + //Tooltip description + var tooltip = d3.select("body") + .append("div") + .attr("id", "tooltip") + .style("position", "absolute") + .style("z-index", "10") + .style("opacity", 0); + + function format_number(x) { + return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); + } + + + function format_description(d) { + var description = d.description; + return '<b>' + d.name + '</b></br>' + d.description + '<br> (' + format_number(d.value) + ')'; + } + + function computeTextRotation(d) { + var angle = (d.x + d.dx / 2) * 180 / Math.PI - 90 + + return angle; + } + + function mouseOverArc(d) { + d3.select(this).attr("stroke", "black") + + tooltip.html(format_description(d)); + return tooltip.transition() + .duration(50) + .style("opacity", 0.9); + } + + function mouseOutArc() { + d3.select(this).attr("stroke", "") + return tooltip.style("opacity", 0); + } + + function mouseMoveArc(d) { + return tooltip + .style("top", (d3.event.pageY - 10) + "px") + .style("left", (d3.event.pageX + 10) + "px"); + } + + var root_ = null; + d3.json("qpi.json", function (error, root) { + if (error) return console.warn(error); + // Compute the initial layout on the entire tree to sum sizes. + // Also compute the full name and fill color for each node, + // and stash the children so they can be restored as we descend. + + partition + .value(function (d) { + return d.score; + }) + .nodes(root) + .forEach(function (d) { + d._children = d.children; + d.sum = d.value; + d.key = key(d); + d.fill = fill(d); + }); + + // Now redefine the value function to use the previously-computed sum. + partition + .children(function (d, depth) { + return depth < 2 ? d._children : null; + }) + .value(function (d) { + return d.sum; + }); + + var center = svg.append("circle") + .attr("r", radius / 3) + .on("click", zoomOut); + + center.append("title") + .text("zoom out"); + + var partitioned_data = partition.nodes(root).slice(1) + + var path = svg.selectAll("path") + .data(partitioned_data) + .enter().append("path") + .attr("d", arc) + .style("fill", function (d) { + return d.fill; + }) + .each(function (d) { + this._current = updateArc(d); + }) + .on("click", zoomIn) + .on("mouseover", mouseOverArc) + .on("mousemove", mouseMoveArc) + .on("mouseout", mouseOutArc); + + + var texts = svg.selectAll("text") + .data(partitioned_data) + .enter().append("text") + .filter(filter_min_arc_size_text) + .attr("transform", function (d) { + return "rotate(" + computeTextRotation(d) + ")"; + }) + .attr("x", function (d) { + return radius / 3 * d.depth; + }) + .attr("dx", "6") // margin + .attr("dy", ".35em") // vertical-align + .text(function (d, i) { + return d.name + }) + + function zoomIn(p) { + if (p.depth > 1) p = p.parent; + if (!p.children) return; + zoom(p, p); + } + + function zoomOut(p) { + if (!p.parent) return; + zoom(p.parent, p); + } + + // Zoom to the specified new root. + function zoom(root, p) { + if (document.documentElement.__transition__) return; + + // Rescale outside angles to match the new layout. + var enterArc, + exitArc, + outsideAngle = d3.scale.linear().domain([0, 2 * Math.PI]); + + function insideArc(d) { + return p.key > d.key + ? {depth: d.depth - 1, x: 0, dx: 0} : p.key < d.key + ? {depth: d.depth - 1, x: 2 * Math.PI, dx: 0} + : {depth: 0, x: 0, dx: 2 * Math.PI}; + } + + function outsideArc(d) { + return {depth: d.depth + 1, x: outsideAngle(d.x), dx: outsideAngle(d.x + d.dx) - outsideAngle(d.x)}; + } + + center.datum(root); + + // When zooming in, arcs enter from the outside and exit to the inside. + // Entering outside arcs start from the old layout. + if (root === p) enterArc = outsideArc, exitArc = insideArc, outsideAngle.range([p.x, p.x + p.dx]); + + var new_data = partition.nodes(root).slice(1) + + path = path.data(new_data, function (d) { + return d.key; + }); + + // When zooming out, arcs enter from the inside and exit to the outside. + // Exiting outside arcs transition to the new layout. + if (root !== p) enterArc = insideArc, exitArc = outsideArc, outsideAngle.range([p.x, p.x + p.dx]); + + d3.transition().duration(d3.event.altKey ? 7500 : 750).each(function () { + path.exit().transition() + .style("fill-opacity", function (d) { + return d.depth === 1 + (root === p) ? 1 : 0; + }) + .attrTween("d", function (d) { + return arcTween.call(this, exitArc(d)); + }) + .remove(); + + path.enter().append("path") + .style("fill-opacity", function (d) { + return d.depth === 2 - (root === p) ? 1 : 0; + }) + .style("fill", function (d) { + return d.fill; + }) + .on("click", zoomIn) + .on("mouseover", mouseOverArc) + .on("mousemove", mouseMoveArc) + .on("mouseout", mouseOutArc) + .each(function (d) { + this._current = enterArc(d); + }); + + + path.transition() + .style("fill-opacity", 1) + .attrTween("d", function (d) { + return arcTween.call(this, updateArc(d)); + }); + + + }); + + + texts = texts.data(new_data, function (d) { + return d.key; + }) + + texts.exit() + .remove() + texts.enter() + .append("text") + + texts.style("opacity", 0) + .attr("transform", function (d) { + return "rotate(" + computeTextRotation(d) + ")"; + }) + .attr("x", function (d) { + return radius / 3 * d.depth; + }) + .attr("dx", "6") // margin + .attr("dy", ".35em") // vertical-align + .filter(filter_min_arc_size_text) + .text(function (d, i) { + return d.name + }) + .transition().delay(750).style("opacity", 1) + + + } + }); + + function key(d) { + var k = [], p = d; + while (p.depth) k.push(p.name), p = p.parent; + return k.reverse().join("."); + } + + function fill(d) { + var p = d; + while (p.depth > 1) p = p.parent; + var c = d3.lab(hue(p.name)); + c.l = luminance(d.sum); + return c; + } + + function arcTween(b) { + var i = d3.interpolate(this._current, b); + this._current = i(0); + return function (t) { + return arc(i(t)); + }; + } + + function updateArc(d) { + return {depth: d.depth, x: d.x, dx: d.dx}; + } + + d3.select(self.frameElement).style("height", margin.top + margin.bottom + "px"); + +</script>
\ No newline at end of file diff --git a/tests/ci/run_ci.sh b/tests/ci/run_ci.sh index 8fd53b36..fa2f2e34 100644 --- a/tests/ci/run_ci.sh +++ b/tests/ci/run_ci.sh @@ -45,6 +45,8 @@ done #set vars from env if not provided by user as options installer_type=${installer_type:-$INSTALLER_TYPE} installer_ip=${installer_ip:-$INSTALLER_IP} +pod_name=${pod_name:-$POD_NAME} +scenario=${scenario:-$SCENARIO} sshoptions="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" @@ -65,7 +67,7 @@ esac cd /home/opnfv -qtip workspace create --pod ${pod_name} --installer ${installer_type} \ +qtip create --template compute --pod ${pod_name} --installer ${installer_type} \ --master-host ${installer_ip} --scenario ${scenario} workspace cd /home/opnfv/workspace/ diff --git a/tests/data/results/expected.json b/tests/data/results/expected.json index a495d999..e77200d4 100644 --- a/tests/data/results/expected.json +++ b/tests/data/results/expected.json @@ -1,7 +1,15 @@ { "score": 150, - "host_results": [ - {"host": "host1", "result": {"score": 100}}, - {"host": "host2", "result": {"score": 200}} - ] + "children": [ + { + "name": "host1", + "score": 100 + }, + { + "name": "host2", + "score": 200 + } + ], + "description": "POD Compute QPI", + "name": "compute" } diff --git a/tests/unit/ansible_library/plugins/action/calculate_test.py b/tests/unit/ansible_library/plugins/action/calculate_test.py index 68a03e2a..fae59821 100644 --- a/tests/unit/ansible_library/plugins/action/calculate_test.py +++ b/tests/unit/ansible_library/plugins/action/calculate_test.py @@ -45,8 +45,8 @@ def section_spec(metric_spec): @pytest.fixture def qpi_spec(section_spec): return { - "description": "QTIP Performance Index of compute", "name": "compute", + "description": "QTIP Performance Index of compute", "sections": [section_spec] } @@ -54,23 +54,29 @@ def qpi_spec(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}]} + 'name': 'ssl_rsa', + 'description': 'metric', + 'children': [{'description': 'workload', 'name': 'rsa_sign', 'score': 1.0}, + {'description': 'workload', '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}]} + 'name': 'ssl', + 'description': 'cryptography and SSL/TLS performance', + 'children': [metric_result]} @pytest.fixture() -def qpi_result(qpi_spec, section_result, metrics): +def qpi_result(section_result, metrics): return {'score': 2048, - 'spec': qpi_spec, - 'metrics': metrics, - 'section_results': [{'name': 'ssl', 'result': section_result}]} + 'name': 'compute', + 'description': 'QTIP Performance Index of compute', + 'children': [section_result], + 'details': { + 'spec': "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml", + 'metrics': metrics}} def test_calc_metric(metric_spec, metrics, metric_result): diff --git a/tests/unit/cli/cmd_plan_test.py b/tests/unit/cli/cmd_plan_test.py deleted file mode 100644 index 53a04800..00000000 --- a/tests/unit/cli/cmd_plan_test.py +++ /dev/null @@ -1,43 +0,0 @@ -############################################################### -# Copyright (c) 2017 taseer94@gmail.com 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 click.testing import CliRunner - -from qtip.cli.entry import cli - - -@pytest.fixture(scope="module") -def runner(): - return CliRunner() - - -def test_list(runner): - result = runner.invoke(cli, ['plan', 'list']) - assert 'Plan' and 'compute' and 'sample' in result.output - - -def test_run(runner): - result = runner.invoke(cli, ['plan', 'run', 'fake-plan']) - assert result.output == '' - - result = runner.invoke(cli, ['plan', 'run']) - assert 'Missing argument "name".' in result.output - - -def test_show(runner): - result = runner.invoke(cli, ['plan', 'show', 'compute']) - assert 'Name: compute QPI' in result.output - assert 'Description: compute QPI profile' - - 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 |