summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--qtip/ansible_library/plugins/action/calculate.py5
-rw-r--r--qtip/ansible_library/plugins/action/collect.py13
-rw-r--r--resources/QPI/compute.yaml36
-rw-r--r--resources/metric/inxi.yaml (renamed from tests/integration/tasks/inxi.yaml)5
-rw-r--r--resources/metric/openssl.yaml (renamed from tests/integration/tasks/openssl.yaml)1
-rw-r--r--resources/template/hosts.j2 (renamed from tests/integration/hosts.j2)0
-rw-r--r--resources/template/hosts.sample (renamed from tests/integration/hosts.sample)0
-rw-r--r--resources/template/qpi-report.j2 (renamed from tests/integration/templates/qpi-report.j2)0
-rw-r--r--resources/template/qpi-report.sample (renamed from tests/integration/reports/qpi-report)0
-rw-r--r--resources/template/ssh.cfg.j2 (renamed from tests/integration/ssh.cfg.j2)0
-rw-r--r--resources/template/ssh.cfg.sample (renamed from tests/integration/ssh.cfg.sample)0
-rw-r--r--resources/template/system-info.j2 (renamed from tests/integration/templates/system-info.j2)0
-rw-r--r--resources/template/system-info.sample (renamed from tests/integration/reports/system-info)0
-rw-r--r--tests/integration/ansible.cfg415
-rw-r--r--tests/integration/group_vars/all2
-rw-r--r--tests/integration/hosts.default6
-rw-r--r--tests/integration/run.yaml50
-rw-r--r--tests/integration/setup.yaml4
-rw-r--r--tests/integration/specs/compute.yaml36
20 files changed, 89 insertions, 490 deletions
diff --git a/.gitignore b/.gitignore
index 64945b8a..03de790a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,3 +73,9 @@ ChangeLog
# unignore external data
!/tests/data/**/*
+
+# integration data
+/tests/integration/hosts
+/tests/integration/ssh.cfg
+/tests/integration/reports/*
+!/tests/integration/reports/*.sample
diff --git a/qtip/ansible_library/plugins/action/calculate.py b/qtip/ansible_library/plugins/action/calculate.py
index f88729b7..ac7f10f2 100644
--- a/qtip/ansible_library/plugins/action/calculate.py
+++ b/qtip/ansible_library/plugins/action/calculate.py
@@ -10,6 +10,7 @@
##############################################################################
from numpy import mean
+import yaml
from ansible.plugins.action import ActionBase
from ansible.utils.display import Display
@@ -28,7 +29,9 @@ class ActionModule(ActionBase):
if result.get('skipped', False):
return result
- spec = self._task.args.get('spec')
+ 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)
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/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 6c2db6a4..47eb2e73 100644
--- a/tests/integration/tasks/inxi.yaml
+++ b/resources/metric/inxi.yaml
@@ -14,7 +14,7 @@
- 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
@@ -31,7 +31,7 @@
# 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'
@@ -40,4 +40,5 @@
- '.+\sKernel:\s+(?P<kernel>.+)\sConsole'
- '.+\s+HDD Total Size:\s+(?P<disk>.+)\s'
- '.+\sproduct:\s+(?P<product>.+)\sv'
+ dump: 'inix.log'
register: system_info
diff --git a/tests/integration/tasks/openssl.yaml b/resources/metric/openssl.yaml
index 0e70913e..2dda0e33 100644
--- a/tests/integration/tasks/openssl.yaml
+++ b/resources/metric/openssl.yaml
@@ -40,6 +40,7 @@
^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
diff --git a/tests/integration/hosts.j2 b/resources/template/hosts.j2
index 868a4e57..868a4e57 100644
--- a/tests/integration/hosts.j2
+++ b/resources/template/hosts.j2
diff --git a/tests/integration/hosts.sample b/resources/template/hosts.sample
index e37d38ec..e37d38ec 100644
--- a/tests/integration/hosts.sample
+++ b/resources/template/hosts.sample
diff --git a/tests/integration/templates/qpi-report.j2 b/resources/template/qpi-report.j2
index afe9bfb8..afe9bfb8 100644
--- a/tests/integration/templates/qpi-report.j2
+++ b/resources/template/qpi-report.j2
diff --git a/tests/integration/reports/qpi-report b/resources/template/qpi-report.sample
index cb9e9308..cb9e9308 100644
--- a/tests/integration/reports/qpi-report
+++ b/resources/template/qpi-report.sample
diff --git a/tests/integration/ssh.cfg.j2 b/resources/template/ssh.cfg.j2
index 2fe049e2..2fe049e2 100644
--- a/tests/integration/ssh.cfg.j2
+++ b/resources/template/ssh.cfg.j2
diff --git a/tests/integration/ssh.cfg.sample b/resources/template/ssh.cfg.sample
index efa45ab6..efa45ab6 100644
--- a/tests/integration/ssh.cfg.sample
+++ b/resources/template/ssh.cfg.sample
diff --git a/tests/integration/templates/system-info.j2 b/resources/template/system-info.j2
index 305a2af2..305a2af2 100644
--- a/tests/integration/templates/system-info.j2
+++ b/resources/template/system-info.j2
diff --git a/tests/integration/reports/system-info b/resources/template/system-info.sample
index 371243e2..371243e2 100644
--- a/tests/integration/reports/system-info
+++ b/resources/template/system-info.sample
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/group_vars/all b/tests/integration/group_vars/all
new file mode 100644
index 00000000..7c56f570
--- /dev/null
+++ b/tests/integration/group_vars/all
@@ -0,0 +1,2 @@
+qtip_resources: ../../resources
+qtip_reports: ./reports
diff --git a/tests/integration/hosts.default b/tests/integration/hosts.default
new file mode 100644
index 00000000..9b91eea6
--- /dev/null
+++ b/tests/integration/hosts.default
@@ -0,0 +1,6 @@
+[fuel-master]
+fuel-master
+
+[local]
+localhost ansible_connection=local
+
diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml
index 7eb141d7..86b36284 100644
--- a/tests/integration/run.yaml
+++ b/tests/integration/run.yaml
@@ -16,11 +16,11 @@
tasks:
- name: check ssh connection
ping:
- # collect system information
- name: collect system information
- include: tasks/inxi.yaml
+ include: "{{ qtip_resources }}/metric/inxi.yaml"
- name: ssl metrics
- include: tasks/openssl.yaml
+ include: "{{ qtip_resources }}/metric/openssl.yaml"
+ tags: [ssl]
- hosts: compute
tasks:
@@ -28,43 +28,25 @@
calculate:
metrics:
ssl_rsa: "{{ openssl_rsa_metrics }}"
- spec: # TODO(yujunz) load spec from file
- 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
+ spec: "{{ qtip_resources }}/QPI/compute.yaml"
register: qpi_result
delegate_to: localhost
+ tags: [calculate]
# Generate and publish report
- hosts: local
tasks:
+ - name: create report folder
+ file:
+ path: "{{ qtip_reports }}"
+ state: directory
- name: create system information report
- template: src=templates/system-info.j2 dest=reports/system-info
+ template:
+ src: "{{ qtip_resources }}/template/system-info.j2"
+ dest: "{{ qtip_reports }}/system-info"
- name: create qpi report
- template: src=templates/qpi-report.j2 dest=reports/qpi-report
+ template:
+ src: "{{ qtip_resources }}/template/qpi-report.j2"
+ dest: "{{ qtip_reports }}/qpi-report"
+ tags: [report]
# TODO(yujunz) push test result to testapi
diff --git a/tests/integration/setup.yaml b/tests/integration/setup.yaml
index 784d6cc5..4af9a129 100644
--- a/tests/integration/setup.yaml
+++ b/tests/integration/setup.yaml
@@ -14,8 +14,8 @@
- name: collect facts of fuel hosts
fuel:
- name: update inventory file
- template: src=./hosts.j2 dest=./hosts
+ template: src={{ qtip_resources }}/template/hosts.j2 dest=./hosts
delegate_to: localhost
- name: update ssh.cfg file
- template: src=./ssh.cfg.j2 dest=./ssh.cfg
+ template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg
delegate_to: localhost
diff --git a/tests/integration/specs/compute.yaml b/tests/integration/specs/compute.yaml
deleted file mode 100644
index 0266ac8d..00000000
--- a/tests/integration/specs/compute.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-##############################################################################
-# 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: 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
- baeline: 102.1
- - name: rsa_verify_4096
- baseline: 6402.9