From 2fa6b511f1a6c1a3372aacdacf7b6f68a4c72ddf Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 12 Apr 2017 19:44:00 +0800 Subject: Move YAML resources to /resources. - replacing the content of /benchmarks will break current module like api/cli - migration required before surpressing the current benchmarks/ folder Change-Id: I8bd04eeb18aaa3c966330ff7adbe85a267680fc1 Signed-off-by: Yujun Zhang --- resources/QPI/compute.yaml | 36 +++ resources/metric/inxi.yaml | 44 +++ resources/metric/openssl.yaml | 54 ++++ resources/template/hosts.j2 | 21 ++ resources/template/hosts.sample | 83 ++++++ resources/template/qpi-report.j2 | 18 ++ resources/template/qpi-report.sample | 46 +++ resources/template/ssh.cfg.j2 | 14 + resources/template/ssh.cfg.sample | 56 ++++ resources/template/system-info.j2 | 16 ++ resources/template/system-info.sample | 36 +++ tests/integration/ansible.cfg | 415 --------------------------- tests/integration/group_vars/all | 2 + tests/integration/hosts.default | 6 + tests/integration/hosts.j2 | 21 -- tests/integration/hosts.sample | 83 ------ tests/integration/reports/qpi-report.sample | 46 --- tests/integration/reports/system-info.sample | 36 --- tests/integration/run.yaml | 19 +- tests/integration/setup.yaml | 4 +- tests/integration/specs/compute.yaml | 36 --- tests/integration/ssh.cfg.j2 | 14 - tests/integration/ssh.cfg.sample | 56 ---- tests/integration/tasks/inxi.yaml | 44 --- tests/integration/tasks/openssl.yaml | 53 ---- tests/integration/templates/qpi-report.j2 | 18 -- tests/integration/templates/system-info.j2 | 16 -- 27 files changed, 447 insertions(+), 846 deletions(-) create mode 100644 resources/QPI/compute.yaml create mode 100644 resources/metric/inxi.yaml create mode 100644 resources/metric/openssl.yaml create mode 100644 resources/template/hosts.j2 create mode 100644 resources/template/hosts.sample create mode 100644 resources/template/qpi-report.j2 create mode 100644 resources/template/qpi-report.sample create mode 100644 resources/template/ssh.cfg.j2 create mode 100644 resources/template/ssh.cfg.sample create mode 100644 resources/template/system-info.j2 create mode 100644 resources/template/system-info.sample create mode 100644 tests/integration/group_vars/all create mode 100644 tests/integration/hosts.default delete mode 100644 tests/integration/hosts.j2 delete mode 100644 tests/integration/hosts.sample delete mode 100644 tests/integration/reports/qpi-report.sample delete mode 100644 tests/integration/reports/system-info.sample delete mode 100644 tests/integration/specs/compute.yaml delete mode 100644 tests/integration/ssh.cfg.j2 delete mode 100644 tests/integration/ssh.cfg.sample delete mode 100644 tests/integration/tasks/inxi.yaml delete mode 100644 tests/integration/tasks/openssl.yaml delete mode 100644 tests/integration/templates/qpi-report.j2 delete mode 100644 tests/integration/templates/system-info.j2 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/resources/metric/inxi.yaml b/resources/metric/inxi.yaml new file mode 100644 index 00000000..47eb2e73 --- /dev/null +++ b/resources/metric/inxi.yaml @@ -0,0 +1,44 @@ +############################################################################## +# 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 inxi - Command line system information script for console and IRC + package: + name: inxi + state: present + +- name: check hardware information with inxi + command: inxi -b -c0 -n + 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_out.stdout }}" + patterns: + - '.+\s+Host:\s+(?P.+)\sKernel' + - '.+\sMemory:\s+(?P.+MB)\s' + - '^CPU\(s\):\s+(?P.+)' + - '.+\sDistro:\s+(?P.+)' + - '.+\sKernel:\s+(?P.+)\sConsole' + - '.+\s+HDD Total Size:\s+(?P.+)\s' + - '.+\sproduct:\s+(?P.+)\sv' + 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\d+\.\d)\s+ + ?(?P\d+\.\d)$ + - |- + ^rsa\s+1024\sbits\s.+\s+ + ?(?P\d+\.\d)\s+ + ?(?P\d+\.\d)$ + - |- + ^rsa\s+2048\sbits\s.+\s+ + ?(?P\d+\.\d)\s+ + ?(?P\d+\.\d)$ + - |- + ^rsa\s+4096\sbits\s.+\s+ + ?(?P\d+\.\d)\s+ + ?(?P\d+\.\d)$ + dump: openssl_rsa_log + register: openssl_rsa_metrics + +# - filename: AES-128-CBC_dump +# grep: +# - |- +# ^aes-128-cbc\s+ +# ?(?P\d+\.\w+)\s+ +# ?(?P\d+\.\w+)\s+ +# ?(?P\d+\.\w+)\s+ +# ?(?P\d+\.\w+)\s+ +# ?(?P\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..afe9bfb8 --- /dev/null +++ b/resources/template/qpi-report.j2 @@ -0,0 +1,18 @@ +Sample QPI Report +{% 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/resources/template/system-info.sample b/resources/template/system-info.sample new file mode 100644 index 00000000..371243e2 --- /dev/null +++ b/resources/template/system-info.sample @@ -0,0 +1,36 @@ +System Information from inxi +============================ + +node-26 +----------------------------- + +CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz +Disk............................................................................1200.3GB (0.8% used) +Host Name.........................................................................node-26.zte.com.cn +Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) +Memory.............................................................................3836.1/128524.1MB +Operating System.................................................................Ubuntu 16.04 xenial +Product......................................................................................EC600G3 + +node-28 +----------------------------- + +CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz +Disk............................................................................1200.3GB (0.8% used) +Host Name.........................................................................node-28.zte.com.cn +Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) +Memory.............................................................................3826.6/128524.1MB +Operating System.................................................................Ubuntu 16.04 xenial +Product......................................................................................EC600G3 + +node-27 +----------------------------- + +CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz +Disk............................................................................1200.3GB (0.8% used) +Host Name.........................................................................node-27.zte.com.cn +Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) +Memory.............................................................................3922.4/128524.1MB +Operating System.................................................................Ubuntu 16.04 xenial +Product......................................................................................EC600G3 + 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/hosts.j2 b/tests/integration/hosts.j2 deleted file mode 100644 index 868a4e57..00000000 --- a/tests/integration/hosts.j2 +++ /dev/null @@ -1,21 +0,0 @@ -[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/tests/integration/hosts.sample b/tests/integration/hosts.sample deleted file mode 100644 index e37d38ec..00000000 --- a/tests/integration/hosts.sample +++ /dev/null @@ -1,83 +0,0 @@ -[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/tests/integration/reports/qpi-report.sample b/tests/integration/reports/qpi-report.sample deleted file mode 100644 index cb9e9308..00000000 --- a/tests/integration/reports/qpi-report.sample +++ /dev/null @@ -1,46 +0,0 @@ -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/tests/integration/reports/system-info.sample b/tests/integration/reports/system-info.sample deleted file mode 100644 index 371243e2..00000000 --- a/tests/integration/reports/system-info.sample +++ /dev/null @@ -1,36 +0,0 @@ -System Information from inxi -============================ - -node-26 ------------------------------ - -CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz -Disk............................................................................1200.3GB (0.8% used) -Host Name.........................................................................node-26.zte.com.cn -Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) -Memory.............................................................................3836.1/128524.1MB -Operating System.................................................................Ubuntu 16.04 xenial -Product......................................................................................EC600G3 - -node-28 ------------------------------ - -CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz -Disk............................................................................1200.3GB (0.8% used) -Host Name.........................................................................node-28.zte.com.cn -Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) -Memory.............................................................................3826.6/128524.1MB -Operating System.................................................................Ubuntu 16.04 xenial -Product......................................................................................EC600G3 - -node-27 ------------------------------ - -CPU Brand.................2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz -Disk............................................................................1200.3GB (0.8% used) -Host Name.........................................................................node-27.zte.com.cn -Kernel..............................................................4.4.0-66-generic x86_64 (64 bit) -Memory.............................................................................3922.4/128524.1MB -Operating System.................................................................Ubuntu 16.04 xenial -Product......................................................................................EC600G3 - diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml index 704ce831..86b36284 100644 --- a/tests/integration/run.yaml +++ b/tests/integration/run.yaml @@ -16,11 +16,10 @@ 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 @@ -29,7 +28,7 @@ calculate: metrics: ssl_rsa: "{{ openssl_rsa_metrics }}" - spec: specs/compute.yaml + spec: "{{ qtip_resources }}/QPI/compute.yaml" register: qpi_result delegate_to: localhost tags: [calculate] @@ -37,9 +36,17 @@ # 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 736aef22..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: 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/ssh.cfg.j2 b/tests/integration/ssh.cfg.j2 deleted file mode 100644 index 2fe049e2..00000000 --- a/tests/integration/ssh.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# 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/tests/integration/ssh.cfg.sample b/tests/integration/ssh.cfg.sample deleted file mode 100644 index efa45ab6..00000000 --- a/tests/integration/ssh.cfg.sample +++ /dev/null @@ -1,56 +0,0 @@ -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/tests/integration/tasks/inxi.yaml b/tests/integration/tasks/inxi.yaml deleted file mode 100644 index 47eb2e73..00000000 --- a/tests/integration/tasks/inxi.yaml +++ /dev/null @@ -1,44 +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 -############################################################################## - -- name: install inxi - Command line system information script for console and IRC - package: - name: inxi - state: present - -- name: check hardware information with inxi - command: inxi -b -c0 -n - 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_out.stdout }}" - patterns: - - '.+\s+Host:\s+(?P.+)\sKernel' - - '.+\sMemory:\s+(?P.+MB)\s' - - '^CPU\(s\):\s+(?P.+)' - - '.+\sDistro:\s+(?P.+)' - - '.+\sKernel:\s+(?P.+)\sConsole' - - '.+\s+HDD Total Size:\s+(?P.+)\s' - - '.+\sproduct:\s+(?P.+)\sv' - dump: 'inix.log' - register: system_info diff --git a/tests/integration/tasks/openssl.yaml b/tests/integration/tasks/openssl.yaml deleted file mode 100644 index 0e70913e..00000000 --- a/tests/integration/tasks/openssl.yaml +++ /dev/null @@ -1,53 +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 -############################################################################## - -- 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\d+\.\d)\s+ - ?(?P\d+\.\d)$ - - |- - ^rsa\s+1024\sbits\s.+\s+ - ?(?P\d+\.\d)\s+ - ?(?P\d+\.\d)$ - - |- - ^rsa\s+2048\sbits\s.+\s+ - ?(?P\d+\.\d)\s+ - ?(?P\d+\.\d)$ - - |- - ^rsa\s+4096\sbits\s.+\s+ - ?(?P\d+\.\d)\s+ - ?(?P\d+\.\d)$ - register: openssl_rsa_metrics - -# - filename: AES-128-CBC_dump -# grep: -# - |- -# ^aes-128-cbc\s+ -# ?(?P\d+\.\w+)\s+ -# ?(?P\d+\.\w+)\s+ -# ?(?P\d+\.\w+)\s+ -# ?(?P\d+\.\w+)\s+ -# ?(?P\d+\.\w+)$ diff --git a/tests/integration/templates/qpi-report.j2 b/tests/integration/templates/qpi-report.j2 deleted file mode 100644 index afe9bfb8..00000000 --- a/tests/integration/templates/qpi-report.j2 +++ /dev/null @@ -1,18 +0,0 @@ -Sample QPI Report -{% 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/tests/integration/templates/system-info.j2 b/tests/integration/templates/system-info.j2 deleted file mode 100644 index 305a2af2..00000000 --- a/tests/integration/templates/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].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 %} -- cgit 1.2.3-korg