summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--qtip/ansible_library/modules/apex_generate_inventory.py (renamed from qtip/ansible_library/modules/apex.py)44
-rw-r--r--qtip/driver/playbook/unixbench/setup.yaml2
-rw-r--r--resources/metric/nDPI.yaml28
-rw-r--r--resources/roles/development-tools/tasks/main.yml23
-rw-r--r--resources/roles/qtip-bootstrap/defaults/main.yml14
-rw-r--r--resources/roles/qtip-bootstrap/files/fixtures/case.json (renamed from tests/integration/fixtures/case.json)0
-rw-r--r--resources/roles/qtip-bootstrap/files/fixtures/pod.json (renamed from tests/integration/fixtures/pod.json)2
-rw-r--r--resources/roles/qtip-bootstrap/files/fixtures/project.json (renamed from tests/integration/fixtures/project.json)0
-rw-r--r--resources/roles/qtip-bootstrap/files/group_vars/all.yml13
-rw-r--r--resources/roles/qtip-bootstrap/files/host_vars/localhost.yml16
-rw-r--r--resources/roles/qtip-bootstrap/files/run.yml (renamed from tests/integration/run.yaml)16
-rw-r--r--resources/roles/qtip-bootstrap/files/setup.yml (renamed from tests/integration/setup.yaml)21
-rw-r--r--resources/roles/qtip-bootstrap/tasks/main.yml25
-rw-r--r--resources/roles/qtip-bootstrap/templates/ansible.cfg.j2444
-rw-r--r--resources/roles/qtip-bootstrap/templates/hosts.j2 (renamed from tests/integration/hosts.default)5
-rw-r--r--resources/roles/unixbench/defaults/main.yml12
-rw-r--r--resources/roles/unixbench/meta/main.yml12
-rw-r--r--resources/roles/unixbench/tasks/main.yml36
-rw-r--r--tests/integration/ansible.cfg19
-rw-r--r--tests/integration/group_vars/all4
-rw-r--r--tests/integration/host_vars/localhost7
-rw-r--r--tests/integration/hosts1
l---------tests/integration/roles1
-rw-r--r--tests/integration/workspace-create.yml13
-rw-r--r--tests/unit/ansible_library/modules/apex_generate_inventory_test.py (renamed from tests/unit/ansible_library/modules/apex_test.py)4
26 files changed, 669 insertions, 98 deletions
diff --git a/.gitignore b/.gitignore
index a098d85d..fcd28944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,4 @@ ChangeLog
# integration data
/tests/integration/*.retry
-/tests/integration/dump
-/tests/integration/hosts
-/tests/integration/reports
-/tests/integration/ssh.cfg
+/tests/integration/*-workspace
diff --git a/qtip/ansible_library/modules/apex.py b/qtip/ansible_library/modules/apex_generate_inventory.py
index 218440b2..9621ba6e 100644
--- a/qtip/ansible_library/modules/apex.py
+++ b/qtip/ansible_library/modules/apex_generate_inventory.py
@@ -10,7 +10,6 @@
##############################################################################
from collections import defaultdict
-import json
import re
from ansible.module_utils.basic import AnsibleModule
@@ -70,10 +69,7 @@ EXAMPLES = '''
def generate_inventory(baremetal_info, server_info):
- """Generate ansible inventory from node list in json format
-
- Modified from https://github.com/martineg/ansible-apex-inventory/blob/master/apex.py
- """
+ """Generate ansible inventory in json format"""
hosts = defaultdict(list)
hosts_meta = {}
@@ -95,37 +91,17 @@ def generate_inventory(baremetal_info, server_info):
def main():
- module = AnsibleModule(argument_spec=dict())
-
- (rc, out, err) = module.run_command(['source ~/stackrc'])
-
- if rc is not None and rc != 0:
- return module.fail_json(msg=err)
-
- cmd = [module.get_bin_path('openstack', True),
- 'baremetal',
- 'list',
- '--fields instance_uuid properties provision_state',
- '--format json']
- (rc, out, err) = module.run_command(cmd)
-
- if rc is not None and rc != 0:
- return module.fail_json(msg=err)
-
- baremetal_info = json.loads(out)
-
- cmd = [module.get_bin_path('openstack', True),
- 'server',
- 'list',
- '--format json']
- (rc, out, err) = module.run_command(cmd)
-
- if rc is not None and rc != 0:
- return module.fail_json(msg=err)
+ module = AnsibleModule(
+ argument_spec=dict(
+ baremetal_info=dict(type='list'),
+ server_info=dict(type='list')
+ )
+ )
- server_info = json.loads(out)
+ baremetal_info = module.params['baremetal_info']
+ server_info = module.params['server_info']
- module.exit_json(changed=False,
+ module.exit_json(changed=True,
ansible_facts=generate_inventory(baremetal_info, server_info))
diff --git a/qtip/driver/playbook/unixbench/setup.yaml b/qtip/driver/playbook/unixbench/setup.yaml
index 4b9b5240..4dcdd2c4 100644
--- a/qtip/driver/playbook/unixbench/setup.yaml
+++ b/qtip/driver/playbook/unixbench/setup.yaml
@@ -61,5 +61,5 @@
repo: https://github.com/kdlucas/byte-unixbench.git
dest: '{{ ansible_env.HOME }}/tempT/'
- - name: Make UnixBench
+ - name: Make UnixBench1
shell: make --directory $HOME/tempT/UnixBench/ \ No newline at end of file
diff --git a/resources/metric/nDPI.yaml b/resources/metric/nDPI.yaml
index 0391302a..b3e7259f 100644
--- a/resources/metric/nDPI.yaml
+++ b/resources/metric/nDPI.yaml
@@ -10,32 +10,12 @@
- name: prepare sample pcap file
get_url:
- url: "https://build.opnfv.org/artifacts.opnfv.org/qtip/utilities/test.pcap"
- dest: "{{ qtip_dump }}/localhost/{{ nDPI_file }}"
- validate_certs: no # required when using proxy for https
+ url: "http://artifacts.opnfv.org/qtip/utilities/test.pcap"
+ dest: "{{ qtip_cache }}/{{ nDPI_file }}"
+ # validate_certs: no # required when using proxy for https
run_once: yes
delegate_to: localhost
-- name: installing nDPI dependencies if CentOS
- yum:
- name: '{{ item }}'
- state: present
- when: ansible_os_family == "RedHat"
- with_items:
- - git
- - gcc
- - patch
- - perl-Time-HiRes
- - autofconf
- - automake
- - libpcap-devel libtool
-
-- name: installing nDPI dependencies if Ubuntu
- apt:
- name: build-essential
- state: present
- when: ansible_os_family == "Debian"
-
- name: making nDPI temporary directory
file:
path: "{{ nDPI_cwd }}"
@@ -60,7 +40,7 @@
- name: copy sample packet file
copy:
- src: "{{ qtip_dump }}/localhost/{{ nDPI_file }}"
+ src: "{{ qtip_cache}}/{{ nDPI_file }}"
dest: "{{ nDPI_cwd }}/example/{{ nDPI_file }}"
- name:
diff --git a/resources/roles/development-tools/tasks/main.yml b/resources/roles/development-tools/tasks/main.yml
new file mode 100644
index 00000000..5fcb19db
--- /dev/null
+++ b/resources/roles/development-tools/tasks/main.yml
@@ -0,0 +1,23 @@
+##############################################################################
+# 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 development tools for Debian family
+ package:
+ name: build-essential
+ state: present
+ when: ansible_os_family == "Debian"
+
+- name: install development tools for RedHat family
+ yum:
+ name: '{{ item }}'
+ state: present
+ when: ansible_os_family == "RedHat"
+ with_items:
+ - "@Development tools"
+ - gcc-c++
diff --git a/resources/roles/qtip-bootstrap/defaults/main.yml b/resources/roles/qtip-bootstrap/defaults/main.yml
new file mode 100644
index 00000000..10e464e4
--- /dev/null
+++ b/resources/roles/qtip-bootstrap/defaults/main.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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
+##############################################################################
+
+installer: fuel
+installer_master: fuel-master
+
+workspace: "./{{ installer }}-workspace"
+qtip_package: ../..
diff --git a/tests/integration/fixtures/case.json b/resources/roles/qtip-bootstrap/files/fixtures/case.json
index 22abc40f..22abc40f 100644
--- a/tests/integration/fixtures/case.json
+++ b/resources/roles/qtip-bootstrap/files/fixtures/case.json
diff --git a/tests/integration/fixtures/pod.json b/resources/roles/qtip-bootstrap/files/fixtures/pod.json
index 8c2863ba..654b5828 100644
--- a/tests/integration/fixtures/pod.json
+++ b/resources/roles/qtip-bootstrap/files/fixtures/pod.json
@@ -1,6 +1,6 @@
{
"details": "",
"role": "",
- "name": "internal",
+ "name": "qtip-pod",
"mode": ""
} \ No newline at end of file
diff --git a/tests/integration/fixtures/project.json b/resources/roles/qtip-bootstrap/files/fixtures/project.json
index ecd03e83..ecd03e83 100644
--- a/tests/integration/fixtures/project.json
+++ b/resources/roles/qtip-bootstrap/files/fixtures/project.json
diff --git a/resources/roles/qtip-bootstrap/files/group_vars/all.yml b/resources/roles/qtip-bootstrap/files/group_vars/all.yml
new file mode 100644
index 00000000..933cffe5
--- /dev/null
+++ b/resources/roles/qtip-bootstrap/files/group_vars/all.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# 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
+##############################################################################
+
+qtip_resources: ../../resources
+qtip_reports: ./reports
+qtip_fixtures: ./fixtures
+qtip_dump: ./dump
diff --git a/resources/roles/qtip-bootstrap/files/host_vars/localhost.yml b/resources/roles/qtip-bootstrap/files/host_vars/localhost.yml
new file mode 100644
index 00000000..66aa5d0e
--- /dev/null
+++ b/resources/roles/qtip-bootstrap/files/host_vars/localhost.yml
@@ -0,0 +1,16 @@
+##############################################################################
+# 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
+##############################################################################
+
+testapi_url: http://localhost:8000/api/v1
+project_name: qtip
+case_name: compute
+pod_name: qtip-pod
+installer: fuel
+version: master
+scenario: demo
diff --git a/tests/integration/run.yaml b/resources/roles/qtip-bootstrap/files/run.yml
index 5da8ca91..696235c2 100644
--- a/tests/integration/run.yaml
+++ b/resources/roles/qtip-bootstrap/files/run.yml
@@ -16,6 +16,20 @@
tasks:
- name: check ssh connection
ping:
+ tags: [setup]
+
+- hosts: compute
+ roles:
+ - development-tools
+ tags: [setup]
+
+- hosts: compute
+ roles:
+ - unixbench
+ tags: [unixbench]
+
+- hosts: compute
+ tasks:
- name: collect system information
include: "{{ qtip_resources }}/metric/inxi.yaml"
- name: ssl metrics
@@ -90,6 +104,6 @@
start_date: "{{ ansible_date_time.date }}"
stop_date: "{{ ansible_date_time.date }}"
criteria: ""
- details: " {{ pod_result }}"
+ details: "{{ pod_result }}"
tags: [testapi]
diff --git a/tests/integration/setup.yaml b/resources/roles/qtip-bootstrap/files/setup.yml
index 8d055c23..fed5e9d9 100644
--- a/tests/integration/setup.yaml
+++ b/resources/roles/qtip-bootstrap/files/setup.yml
@@ -20,6 +20,27 @@
template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg
delegate_to: localhost
+- hosts: apex-undercloud
+ gather_facts: no
+
+ tasks:
+ - name: collect overcloud baremetal info
+ shell: . /root/stackrc && openstack baremetal list --fields instance_uuid properties provision_state --format json
+ register: baremetal_info
+ - name: collect overcloud server info
+ shell: . /root/stackrc && openstack server list --format json
+ register: server_info
+ - name: generate inventory
+ apex_generate_inventory:
+ baremetal_info: "{{ baremetal_info.stdout | from_json }}"
+ server_info: "{{ server_info.stdout | from_json }}"
+ - name: update inventory file
+ template: src={{ qtip_resources }}/template/hosts.j2 dest=./hosts
+ delegate_to: localhost
+ - name: update ssh.cfg file
+ template: src={{ qtip_resources }}/template/ssh.cfg.j2 dest=./ssh.cfg
+ delegate_to: localhost
+
# Initialize testapi database
- hosts: localhost
tasks:
diff --git a/resources/roles/qtip-bootstrap/tasks/main.yml b/resources/roles/qtip-bootstrap/tasks/main.yml
new file mode 100644
index 00000000..96d6c7d8
--- /dev/null
+++ b/resources/roles/qtip-bootstrap/tasks/main.yml
@@ -0,0 +1,25 @@
+##############################################################################
+# 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: copy initial files
+ synchronize:
+ src: "{{ item }}"
+ dest: "{{ workspace }}"
+ with_items:
+ - group_vars
+ - host_vars
+ - fixtures
+
+- name: generate default configuration
+ template:
+ src: "{{ item }}.j2"
+ dest: "{{ workspace }}/{{ item }}"
+ with_items:
+ - ansible.cfg
+ - hosts
diff --git a/resources/roles/qtip-bootstrap/templates/ansible.cfg.j2 b/resources/roles/qtip-bootstrap/templates/ansible.cfg.j2
new file mode 100644
index 00000000..1d563f1a
--- /dev/null
+++ b/resources/roles/qtip-bootstrap/templates/ansible.cfg.j2
@@ -0,0 +1,444 @@
+# 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 = {{ qtip_package }}/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 = smart
+
+# 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 = profile_tasks
+
+# 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_package }}/ansible_library/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 = {{ qtip_package }}/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
+ssh_args = -F ssh.cfg
+
+# 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/hosts.default b/resources/roles/qtip-bootstrap/templates/hosts.j2
index 65739726..c4b985b3 100644
--- a/tests/integration/hosts.default
+++ b/resources/roles/qtip-bootstrap/templates/hosts.j2
@@ -1,4 +1,3 @@
-fuel-master
-
-[local]
localhost ansible_connection=local
+
+{{ installer_master }}
diff --git a/resources/roles/unixbench/defaults/main.yml b/resources/roles/unixbench/defaults/main.yml
new file mode 100644
index 00000000..d1facef5
--- /dev/null
+++ b/resources/roles/unixbench/defaults/main.yml
@@ -0,0 +1,12 @@
+#############################################################################
+# 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
+#############################################################################
+
+cwd: "{{ ansible_env.HOME }}/qtip/unixbench"
+iterations: 1
+parallel_copies: 1 \ No newline at end of file
diff --git a/resources/roles/unixbench/meta/main.yml b/resources/roles/unixbench/meta/main.yml
new file mode 100644
index 00000000..03c96c42
--- /dev/null
+++ b/resources/roles/unixbench/meta/main.yml
@@ -0,0 +1,12 @@
+#############################################################################
+# 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
+#############################################################################
+
+---
+dependencies:
+ - { role: development-tools }
diff --git a/resources/roles/unixbench/tasks/main.yml b/resources/roles/unixbench/tasks/main.yml
new file mode 100644
index 00000000..d9d5c8f7
--- /dev/null
+++ b/resources/roles/unixbench/tasks/main.yml
@@ -0,0 +1,36 @@
+#############################################################################
+# 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: make unixbench working directory
+ file:
+ path: "{{ cwd }}"
+ state: directory
+
+- name: download unixbench source code
+ unarchive:
+ src: https://github.com/kdlucas/byte-unixbench/archive/v5.1.3.tar.gz
+ dest: "{{ cwd }}"
+ remote_src: yes
+
+- name: build UnixBench
+ command: "make"
+ args:
+ chdir: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench"
+
+- name: run whetstone and dhrystone
+ shell: "./Run -i {{ iterations }} -c {{ parallel_copies }} dhrystone whetstone"
+ args:
+ chdir: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench"
+
+- name: synchronize test results to local
+ synchronize:
+ mode: pull
+ src: "{{ cwd }}/byte-unixbench-5.1.3/UnixBench/results"
+ dest: "{{ qtip_dump }}/{{ inventory_hostname }}/unixbench"
+ use_ssh_args: yes
diff --git a/tests/integration/ansible.cfg b/tests/integration/ansible.cfg
index 30e28480..a11bd1af 100644
--- a/tests/integration/ansible.cfg
+++ b/tests/integration/ansible.cfg
@@ -11,20 +11,5 @@
# some basic default values...
-inventory = ./hosts
-library = ../../qtip/ansible_library/
-
-# set plugin path directories here, separate with colons
-action_plugins = ../../qtip/ansible_library/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 = ../../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
-
-callback_whitelist = profile_tasks
+inventory = hosts
+roles_path = ../../resources/roles
diff --git a/tests/integration/group_vars/all b/tests/integration/group_vars/all
deleted file mode 100644
index a84ab51f..00000000
--- a/tests/integration/group_vars/all
+++ /dev/null
@@ -1,4 +0,0 @@
-qtip_resources: ../../resources
-qtip_reports: ./reports
-qtip_fixtures: ./fixtures
-qtip_dump: ./dump
diff --git a/tests/integration/host_vars/localhost b/tests/integration/host_vars/localhost
deleted file mode 100644
index 18d764cc..00000000
--- a/tests/integration/host_vars/localhost
+++ /dev/null
@@ -1,7 +0,0 @@
-testapi_url: http://localhost:8000/api/v1
-project_name: qtip
-case_name: compute
-pod_name: internal
-installer: fuel
-version: master
-scenario: demo
diff --git a/tests/integration/hosts b/tests/integration/hosts
new file mode 100644
index 00000000..2302edae
--- /dev/null
+++ b/tests/integration/hosts
@@ -0,0 +1 @@
+localhost ansible_connection=local
diff --git a/tests/integration/roles b/tests/integration/roles
new file mode 120000
index 00000000..a2363eeb
--- /dev/null
+++ b/tests/integration/roles
@@ -0,0 +1 @@
+../../resources/roles \ No newline at end of file
diff --git a/tests/integration/workspace-create.yml b/tests/integration/workspace-create.yml
new file mode 100644
index 00000000..83e0fadd
--- /dev/null
+++ b/tests/integration/workspace-create.yml
@@ -0,0 +1,13 @@
+##############################################################################
+# 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
+ roles:
+ - { role: qtip-bootstrap, installer: fuel }
diff --git a/tests/unit/ansible_library/modules/apex_test.py b/tests/unit/ansible_library/modules/apex_generate_inventory_test.py
index 8a1d0673..7df9d35c 100644
--- a/tests/unit/ansible_library/modules/apex_test.py
+++ b/tests/unit/ansible_library/modules/apex_generate_inventory_test.py
@@ -10,7 +10,7 @@
import json
import os
-from qtip.ansible_library.modules import apex
+from qtip.ansible_library.modules import apex_generate_inventory
def test_generate_inventory(data_root):
@@ -18,7 +18,7 @@ def test_generate_inventory(data_root):
'apex', 'baremetal_info.json')))
server_info = json.load(open(os.path.join(data_root, 'external',
'apex', 'server_info.json')))
- inventory = apex.generate_inventory(baremetal_info, server_info)
+ inventory = apex_generate_inventory.generate_inventory(baremetal_info, server_info)
assert dict(inventory['hosts']) == {
u'compute': [u'192.0.2.5', u'192.0.2.6'],
u'control': [u'192.0.2.7', u'192.0.2.8', u'192.0.2.9']}