28 files changed, 795 insertions, 58 deletions

diff --git a/README.md b/README.md
index 083b1ad6..c54ba5c4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-QTIP is a performance benchmark service for OPNFV platform
+QTIP provides Benchmarking as a Service for OPNFV community
 
-QTIP aims to benchmark OPNFV platforms through a "Bottom up" approach. Emphasis
-on platform performance through quantitative benchmarks rather than validation.
+[ ![Codeship Status for opnfv/qtip](https://app.codeship.com/projects/462a25b0-2590-0135-0943-6a9354bf403f/status?branch=master)](https://app.codeship.com/projects/222465)
 
 See [project wiki](https://wiki.opnfv.org/display/qtip) for more information.
+
diff --git a/qtip/cli/commands/cmd_project.py b/qtip/cli/commands/cmd_project.py
index 117330f5..eefabfc0 100644
--- a/qtip/cli/commands/cmd_project.py
+++ b/qtip/cli/commands/cmd_project.py
@@ -36,6 +36,11 @@ def cli():
 
 
 @cli.command(help="Create new testing project")
+@click.option('--template',
+              prompt='Choose project template',
+              type=click.Choice(['compute', 'doctor']),
+              default='compute',
+              help='Choose project template')
 @click.option('--pod', default='unknown', prompt='Pod Name',
               help='Name of pod under test')
 @click.option('--installer', prompt='OPNFV Installer',
@@ -45,7 +50,8 @@ def cli():
 @click.option('--scenario', prompt='OPNFV Scenario', default='unknown',
               help='OPNFV scenario')
 @click.argument('name')
-def create(pod, installer, master_host, scenario, name):
+def create(pod, installer, master_host, scenario, name, template):
+    qtip_generator_role = os.path.join(utils.QTIP_ANSIBLE_ROLES, 'qtip-generator')
     extra_vars = {
         'qtip_package': utils.QTIP_PACKAGE,
         'cwd': os.getcwd(),
@@ -53,14 +59,16 @@ def create(pod, installer, master_host, scenario, name):
         'installer': installer,
         'scenario': scenario,
         'installer_master_host': master_host,
-        'workspace': name
+        'project_name': name,
+        'project_template': template
     }
-    os.system("ANSIBLE_ROLES_PATH={qtip_package}/{roles_path} ansible-playbook"
-              " -i {qtip_package}/{roles_path}/qtip-workspace/hosts"
-              " {qtip_package}/{roles_path}/qtip-workspace/create.yml"
+    os.system("ANSIBLE_ROLES_PATH={roles_path} ansible-playbook"
+              " -i {hosts}"
+              " {playbook}"
               " --extra-vars '{extra_vars}'"
-              "".format(qtip_package=utils.QTIP_PACKAGE,
-                        roles_path=utils.ROLES_PATH,
+              "".format(roles_path=utils.QTIP_ANSIBLE_ROLES,
+                        hosts=os.path.join(qtip_generator_role, 'hosts'),
+                        playbook=os.path.join(qtip_generator_role, 'main.yml'),
                         extra_vars=utils.join_vars(**extra_vars)))
 
 
diff --git a/qtip/cli/utils.py b/qtip/cli/utils.py
index 832e5ba9..0f0e7e95 100644
--- a/qtip/cli/utils.py
+++ b/qtip/cli/utils.py
@@ -15,7 +15,7 @@ from prettytable import PrettyTable
 
 
 QTIP_PACKAGE = path.join(path.dirname(__file__), os.pardir, os.pardir)
-ROLES_PATH = 'resources/ansible_roles'
+QTIP_ANSIBLE_ROLES = path.join(QTIP_PACKAGE, 'resources', 'ansible_roles')
 
 
 def join_vars(**kwargs):
diff --git a/resources/QPI/compute-baseline.json b/resources/QPI/compute-baseline.json
new file mode 100644
index 00000000..25378d10
--- /dev/null
+++ b/resources/QPI/compute-baseline.json
@@ -0,0 +1,173 @@
+{
+  "name": "compute-baseline",
+  "description": "The baseline for compute QPI",
+  "version": "0.0.1",
+  "score": 2048,
+  "spec": "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml",
+  "system_info": {
+    "product": "EC600G3",
+    "cpu": "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-)",
+    "os": "Ubuntu 16.04 xenial",
+    "kernel": "4.4.0-72-generic x86_64 (64 bit)"
+  },
+  "condition": {
+    "cpu_speed": "1200/3000 MHz",
+    "memory": "4062.3/128524.1MB",
+    "disk": "1200.3GB (0.9% used)",
+    "installer": "Fuel",
+    "scenario": "os-nosdn-nofeature-ha"
+  },
+  "sections": [
+    {
+      "name": "SSL",
+      "metrics": [
+        {
+          "name": "ssl_rsa",
+          "workloads": [
+            {
+              "name": "rsa_sign_512",
+              "baseline": "16521.0"
+            },
+            {
+              "name": "rsa_verify_512",
+              "baseline": "223925.9"
+            },
+            {
+              "name": "rsa_sign_1024",
+              "baseline": "5802.6"
+            },
+            {
+              "name": "rsa_verify_1024",
+              "baseline": "89015.3"
+            },
+            {
+              "name": "rsa_sign_2048",
+              "baseline": "1236.5"
+            },
+            {
+              "name": "rsa_verify_2048",
+              "baseline": "27919.2"
+            },
+            {
+              "name": "rsa_sign_4096",
+              "baseline": "114.9"
+            },
+            {
+              "name": "rsa_verify_4096",
+              "baseline": "8637.9"
+            }
+          ]
+        },
+        {
+          "name": "ssl_aes",
+          "workloads": [
+            {
+              "name": "aes_128_cbc_16_bytes",
+              "baseline": "544031.31k"
+            },
+            {
+              "name": "aes_128_cbc_64_bytes",
+              "baseline": "575116.35k"
+            },
+            {
+              "name": "aes_128_cbc_256_bytes",
+              "baseline": "587653.72k"
+            },
+            {
+              "name": "aes_128_cbc_1024_bytes",
+              "baseline": "595095.21k"
+            },
+            {
+              "name": "aes_128_cbc_8192_bytes",
+              "baseline": "590107.99k"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "DPI",
+      "metrics": [
+        {
+          "name": "dpi_throughput",
+          "workloads": [
+            {
+              "name": "dpi_pps",
+              "baseline": "2.42 M"
+            },
+            {
+              "name": "dpi_bps",
+              "baseline": "22.70 G"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "memory",
+      "metrics": [
+        {
+          "name": "floatmem",
+          "workloads": [
+            {
+              "name": "triad",
+              "baseline": "10215.75"
+            },
+            {
+              "name": "add",
+              "baseline": "10117.36"
+            },
+            {
+              "name": "copy",
+              "baseline": "8168.85"
+            },
+            {
+              "name": "scale",
+              "baseline": "8119.82"
+            }
+          ]
+        },
+        {
+          "name": "intmem",
+          "workloads": [
+            {
+              "name": "triad",
+              "baseline": "12153.15"
+            },
+            {
+              "name": "add",
+              "baseline": "12302.58"
+            },
+            {
+              "name": "copy",
+              "baseline": "12194.48"
+            },
+            {
+              "name": "scale",
+              "baseline": "12187.15"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "arithmetic",
+      "metrics": [
+        {
+          "name": "arithmetic",
+          "workloads": [
+            {
+              "name": "dhrystone_lps",
+              "baseline": "29002911.0"
+            },
+            {
+              "name": "whetstone_MWIPS",
+              "baseline": "2176.8"
+            }
+          ]
+
+        }
+      ]
+    }
+  ]
+}
diff --git a/resources/ansible_roles/qtip-workspace/ansible.cfg b/resources/ansible_roles/qtip-generator/ansible.cfg
index 872941bd..872941bd 100644
--- a/resources/ansible_roles/qtip-workspace/ansible.cfg
+++ b/resources/ansible_roles/qtip-generator/ansible.cfg
diff --git a/resources/ansible_roles/qtip-workspace/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml
index 7f6407d3..846b5169 100644
--- a/resources/ansible_roles/qtip-workspace/defaults/main.yml
+++ b/resources/ansible_roles/qtip-generator/defaults/main.yml
@@ -16,7 +16,9 @@ installer_master_group:
   fuel: fuel-masters
   apex: apex-underclouds
 
-workspace: "workspace"
+project_name: 'qtip-project'
+project_template: 'compute'
+
 qtip_package: ../../..
 qtip_cache: .qtip-cache
 cwd: .
diff --git a/resources/ansible_roles/qtip-workspace/files/template/ansible.cfg b/resources/ansible_roles/qtip-generator/files/compute/ansible.cfg
index a80d4ae4..a80d4ae4 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/ansible.cfg
+++ b/resources/ansible_roles/qtip-generator/files/compute/ansible.cfg
diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/case.json
index 22abc40f..22abc40f 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/case.json
+++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/case.json
diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/pod.json
index 654b5828..654b5828 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/pod.json
+++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/pod.json
diff --git a/resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json b/resources/ansible_roles/qtip-generator/files/compute/fixtures/project.json
index ecd03e83..ecd03e83 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/fixtures/project.json
+++ b/resources/ansible_roles/qtip-generator/files/compute/fixtures/project.json
diff --git a/resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml
index 3d41e1b4..3d41e1b4 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/group_vars/all.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml
diff --git a/resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
index 815e2ea3..815e2ea3 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/host_vars/localhost.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
diff --git a/resources/ansible_roles/qtip-workspace/files/template/hosts b/resources/ansible_roles/qtip-generator/files/compute/hosts
index b8b256a9..b8b256a9 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/hosts
+++ b/resources/ansible_roles/qtip-generator/files/compute/hosts
diff --git a/resources/ansible_roles/qtip-workspace/files/template/run.yml b/resources/ansible_roles/qtip-generator/files/compute/run.yml
index f8e71f0c..f8e71f0c 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/run.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/run.yml
diff --git a/resources/ansible_roles/qtip-workspace/files/template/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml
index d165a9fe..d165a9fe 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/setup.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml
diff --git a/resources/ansible_roles/qtip-workspace/files/template/teardown.yml b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml
index dc659930..dc659930 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/teardown.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml
diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts
index 34e4aa92..34e4aa92 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/templates/hosts
+++ b/resources/ansible_roles/qtip-generator/files/compute/templates/hosts
diff --git a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg
index 67246054..67246054 100644
--- a/resources/ansible_roles/qtip-workspace/files/template/templates/ssh.cfg
+++ b/resources/ansible_roles/qtip-generator/files/compute/templates/ssh.cfg
diff --git a/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg b/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg
new file mode 100644
index 00000000..8dbd12a5
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/files/doctor/ansible.cfg
@@ -0,0 +1,466 @@
+{% raw %}
+# config file for ansible -- https://ansible.com/
+# ===============================================
+
+# nearly all parameters can be overridden in ansible-playbook
+# or with command line flags. ansible will read ANSIBLE_CONFIG,
+# ansible.cfg in the current working directory, .ansible.cfg in
+# the home directory or /etc/ansible/ansible.cfg, whichever it
+# finds first
+
+[defaults]
+
+# some basic default values...
+
+inventory      = hosts
+#library        = /usr/share/my_modules/
+#module_utils   = /usr/share/my_module_utils/
+#remote_tmp     = ~/.ansible/tmp
+#local_tmp      = ~/.ansible/tmp
+#forks          = 5
+#poll_interval  = 15
+#sudo_user      = root
+#ask_sudo_pass = True
+#ask_pass      = True
+#transport      = smart
+#remote_port    = 22
+#module_lang    = C
+#module_set_locale = False
+
+# plays will gather facts by default, which contain information about
+# the remote system.
+#
+# smart - gather by default, but don't regather if already gathered
+# implicit - gather by default, turn off with gather_facts: False
+# explicit - do not gather by default, must say gather_facts: True
+#gathering = implicit
+
+# This only affects the gathering done by a play's gather_facts directive,
+# by default gathering retrieves all facts subsets
+# all - gather all subsets
+# network - gather min and network facts
+# hardware - gather hardware facts (longest facts to retrieve)
+# virtual - gather min and virtual facts
+# facter - import facts from facter
+# ohai - import facts from ohai
+# You can combine them using comma (ex: network,virtual)
+# You can negate them using ! (ex: !hardware,!facter,!ohai)
+# A minimal set of facts is always gathered.
+#gather_subset = all
+
+# some hardware related facts are collected
+# with a maximum timeout of 10 seconds. This
+# option lets you increase or decrease that
+# timeout to something more suitable for the
+# environment.
+
+# gather_timeout = 10
+
+# additional paths to search for roles in, colon separated
+#roles_path    = /etc/ansible/roles
+
+# uncomment this to disable SSH key host checking
+#host_key_checking = False
+
+# change the default callback, you can only have one 'stdout' type  enabled at a time.
+#stdout_callback = skippy
+
+## Ansible ships with some plugins that require whitelisting,
+## this is done to avoid running all of a type by default.
+## These setting lists those that you want enabled for your system.
+## Custom plugins should not need this unless plugin author specifies it.
+
+# enable callback plugins, they can output to stdout but cannot be 'stdout' type.
+#callback_whitelist = timer, mail
+
+# enable inventory plugins, default: 'host_list', 'script', 'ini', 'yaml'
+#inventory_enabled = host_list, aws, openstack, docker
+
+# Determine whether includes in tasks and handlers are "static" by
+# default. As of 2.0, includes are dynamic by default. Setting these
+# values to True will make includes behave more like they did in the
+# 1.x versions.
+#task_includes_static = True
+#handler_includes_static = True
+
+# Controls if a missing handler for a notification event is an error or a warning
+#error_on_missing_handler = True
+
+# change this for alternative sudo implementations
+#sudo_exe = sudo
+
+# What flags to pass to sudo
+# WARNING: leaving out the defaults might create unexpected behaviours
+#sudo_flags = -H -S -n
+
+# SSH timeout
+#timeout = 10
+
+# default user to use for playbooks if user is not specified
+# (/usr/bin/ansible will use current user as default)
+#remote_user = root
+
+# logging is off by default unless this path is defined
+# if so defined, consider logrotate
+#log_path = /var/log/ansible.log
+
+# default module name for /usr/bin/ansible
+#module_name = command
+
+# use this shell for commands executed under sudo
+# you may need to change this to bin/bash in rare instances
+# if sudo is constrained
+#executable = /bin/sh
+
+# if inventory variables overlap, does the higher precedence one win
+# or are hash values merged together?  The default is 'replace' but
+# this can also be set to 'merge'.
+#hash_behaviour = replace
+
+# by default, variables from roles will be visible in the global variable
+# scope. To prevent this, the following option can be enabled, and only
+# tasks and handlers within the role will see the variables there
+#private_role_vars = yes
+
+# list any Jinja2 extensions to enable here:
+#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n
+
+# if set, always use this private key file for authentication, same as
+# if passing --private-key to ansible or ansible-playbook
+#private_key_file = /path/to/file
+
+# If set, configures the path to the Vault password file as an alternative to
+# specifying --vault-password-file on the command line.
+#vault_password_file = /path/to/vault_password_file
+
+# format of string {{ ansible_managed }} available within Jinja2
+# templates indicates to users editing templates files will be replaced.
+# replacing {file}, {host} and {uid} and strftime codes with proper values.
+#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
+# {file}, {host}, {uid}, and the timestamp can all interfere with idempotence
+# in some situations so the default is a static string:
+#ansible_managed = Ansible managed
+
+# by default, ansible-playbook will display "Skipping [host]" if it determines a task
+# should not be run on a host.  Set this to "False" if you don't want to see these "Skipping"
+# messages. NOTE: the task header will still be shown regardless of whether or not the
+# task is skipped.
+#display_skipped_hosts = True
+
+# by default, if a task in a playbook does not include a name: field then
+# ansible-playbook will construct a header that includes the task's action but
+# not the task's args.  This is a security feature because ansible cannot know
+# if the *module* considers an argument to be no_log at the time that the
+# header is printed.  If your environment doesn't have a problem securing
+# stdout from ansible-playbook (or you have manually specified no_log in your
+# playbook on all of the tasks where you have secret information) then you can
+# safely set this to True to get more informative messages.
+#display_args_to_stdout = False
+
+# by default (as of 1.3), Ansible will raise errors when attempting to dereference
+# Jinja2 variables that are not set in templates or action lines. Uncomment this line
+# to revert the behavior to pre-1.3.
+#error_on_undefined_vars = False
+
+# by default (as of 1.6), Ansible may display warnings based on the configuration of the
+# system running ansible itself. This may include warnings about 3rd party packages or
+# other conditions that should be resolved if possible.
+# to disable these warnings, set the following value to False:
+#system_warnings = True
+
+# by default (as of 1.4), Ansible may display deprecation warnings for language
+# features that should no longer be used and will be removed in future versions.
+# to disable these warnings, set the following value to False:
+#deprecation_warnings = True
+
+# (as of 1.8), Ansible can optionally warn when usage of the shell and
+# command module appear to be simplified by using a default Ansible module
+# instead.  These warnings can be silenced by adjusting the following
+# setting or adding warn=yes or warn=no to the end of the command line
+# parameter string.  This will for example suggest using the git module
+# instead of shelling out to the git command.
+# command_warnings = False
+
+# set plugin path directories here, separate with colons
+#action_plugins     = /usr/share/ansible/plugins/action
+#cache_plugins      = /usr/share/ansible/plugins/cache
+#callback_plugins   = /usr/share/ansible/plugins/callback
+#connection_plugins = /usr/share/ansible/plugins/connection
+#lookup_plugins     = /usr/share/ansible/plugins/lookup
+#inventory_plugins  = /usr/share/ansible/plugins/inventory
+#vars_plugins       = /usr/share/ansible/plugins/vars
+#filter_plugins     = /usr/share/ansible/plugins/filter
+#test_plugins       = /usr/share/ansible/plugins/test
+#terminal_plugins   = /usr/share/ansible/plugins/terminal
+#strategy_plugins   = /usr/share/ansible/plugins/strategy
+
+# by default, ansible will use the 'linear' strategy but you may want to try
+# another one
+#strategy = free
+
+# by default callbacks are not loaded for /bin/ansible, enable this if you
+# want, for example, a notification or logging callback to also apply to
+# /bin/ansible runs
+#bin_ansible_callbacks = False
+
+# don't like cows?  that's unfortunate.
+# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1
+#nocows = 1
+
+# set which cowsay stencil you'd like to use by default. When set to 'random',
+# a random stencil will be selected for each task. The selection will be filtered
+# against the `cow_whitelist` option below.
+#cow_selection = default
+#cow_selection = random
+
+# when using the 'random' option for cowsay, stencils will be restricted to this list.
+# it should be formatted as a comma-separated list with no spaces between names.
+# NOTE: line continuations here are for formatting purposes only, as the INI parser
+#       in python does not support them.
+#cow_whitelist=bud-frogs,bunny,cheese,daemon,default,dragon,elephant-in-snake,elephant,eyes,\
+#              hellokitty,kitty,luke-koala,meow,milk,moofasa,moose,ren,sheep,small,stegosaurus,\
+#              stimpy,supermilker,three-eyes,turkey,turtle,tux,udder,vader-koala,vader,www
+
+# don't like colors either?
+# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1
+#nocolor = 1
+
+# if set to a persistent type (not 'memory', for example 'redis') fact values
+# from previous runs in Ansible will be stored.  This may be useful when
+# wanting to use, for example, IP information from one group of servers
+# without having to talk to them in the same playbook run to get their
+# current IP information.
+#fact_caching = memory
+
+# retry files
+# When a playbook fails by default a .retry file will be created in ~/
+# You can disable this feature by setting retry_files_enabled to False
+# and you can change the location of the files by setting retry_files_save_path
+
+#retry_files_enabled = False
+#retry_files_save_path = ~/.ansible-retry
+
+# squash actions
+# Ansible can optimise actions that call modules with list parameters
+# when looping. Instead of calling the module once per with_ item, the
+# module is called once with all items at once. Currently this only works
+# under limited circumstances, and only with parameters named 'name'.
+#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper
+
+# prevents logging of task data, off by default
+#no_log = False
+
+# prevents logging of tasks, but only on the targets, data is still logged on the master/controller
+#no_target_syslog = False
+
+# controls whether Ansible will raise an error or warning if a task has no
+# choice but to create world readable temporary files to execute a module on
+# the remote machine.  This option is False by default for security.  Users may
+# turn this on to have behaviour more like Ansible prior to 2.1.x.  See
+# https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user
+# for more secure ways to fix this than enabling this option.
+#allow_world_readable_tmpfiles = False
+
+# controls the compression level of variables sent to
+# worker processes. At the default of 0, no compression
+# is used. This value must be an integer from 0 to 9.
+#var_compression_level = 9
+
+# controls what compression method is used for new-style ansible modules when
+# they are sent to the remote system.  The compression types depend on having
+# support compiled into both the controller's python and the client's python.
+# The names should match with the python Zipfile compression types:
+# * ZIP_STORED (no compression. available everywhere)
+# * ZIP_DEFLATED (uses zlib, the default)
+# These values may be set per host via the ansible_module_compression inventory
+# variable
+#module_compression = 'ZIP_DEFLATED'
+
+# This controls the cutoff point (in bytes) on --diff for files
+# set to 0 for unlimited (RAM may suffer!).
+#max_diff_size = 1048576
+
+# This controls how ansible handles multiple --tags and --skip-tags arguments
+# on the CLI.  If this is True then multiple arguments are merged together.  If
+# it is False, then the last specified argument is used and the others are ignored.
+# This option will be removed in 2.8.
+#merge_multiple_cli_flags = True
+
+# Controls showing custom stats at the end, off by default
+#show_custom_stats = True
+
+# Controls which files to ignore when using a directory as inventory with
+# possibly multiple sources (both static and dynamic)
+#inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo
+
+# This family of modules use an alternative execution path optimized for network appliances
+# only update this setting if you know how this works, otherwise it can break module execution
+#network_group_modules=['eos', 'nxos', 'ios', 'iosxr', 'junos', 'vyos']
+
+# This keeps facts from polluting the main namespace as variables.
+# Setting to True keeps them under the ansible_facts namespace, the default is False
+#restrict_facts_namespace: True
+
+# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as
+# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain
+# jinja2 templating language which will be run through the templating engine.
+# ENABLING THIS COULD BE A SECURITY RISK
+#allow_unsafe_lookups = False
+
+[privilege_escalation]
+#become=True
+#become_method=sudo
+#become_user=root
+#become_ask_pass=False
+
+[paramiko_connection]
+
+# uncomment this line to cause the paramiko connection plugin to not record new host
+# keys encountered.  Increases performance on new host additions.  Setting works independently of the
+# host key checking setting above.
+#record_host_keys=False
+
+# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this
+# line to disable this behaviour.
+#pty=False
+
+# paramiko will default to looking for SSH keys initially when trying to
+# authenticate to remote devices.  This is a problem for some network devices
+# that close the connection after a key failure.  Uncomment this line to
+# disable the Paramiko look for keys function
+#look_for_keys = False
+
+# When using persistent connections with Paramiko, the connection runs in a
+# background process.  If the host doesn't already have a valid SSH key, by
+# default Ansible will prompt to add the host key.  This will cause connections
+# running in background processes to fail.  Uncomment this line to have
+# Paramiko automatically add host keys.
+#host_key_auto_add = True
+
+[ssh_connection]
+
+# ssh arguments to use
+# Leaving off ControlPersist will result in poor performance, so use
+# paramiko on older platforms rather than removing it, -C controls compression use
+#ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s
+
+# The base directory for the ControlPath sockets.
+
+# This is the "%(directory)s" in the control_path option
+#
+
+# Example:
+
+# control_path_dir = /tmp/.ansible/cp
+#control_path_dir = ~/.ansible/cp
+
+# The path to use for the ControlPath sockets. This defaults to a hashed string of the hostname,
+
+# port and username (empty string in the config). The hash mitigates a common problem users
+
+# found with long hostames and the conventional %(directory)s/ansible-ssh-%%h-%%p-%%r format.
+
+# In those cases, a "too long for Unix domain socket" ssh error would occur.
+#
+# Example:
+# control_path = %(directory)s/%%h-%%r
+#control_path =
+
+# Enabling pipelining reduces the number of SSH operations required to
+# execute a module on the remote server. This can result in a significant
+# performance improvement when enabled, however when using "sudo:" you must
+# first disable 'requiretty' in /etc/sudoers
+#
+# By default, this option is disabled to preserve compatibility with
+# sudoers configurations that have requiretty (the default on many distros).
+#
+#pipelining = False
+
+# Control the mechanism for transferring files (old)
+#   * smart = try sftp and then try scp [default]
+#   * True = use scp only
+#   * False = use sftp only
+#scp_if_ssh = smart
+
+# Control the mechanism for transferring files (new)
+# If set, this will override the scp_if_ssh option
+#   * sftp  = use sftp to transfer files
+#   * scp   = use scp to transfer files
+#   * piped = use 'dd' over SSH to transfer files
+#   * smart = try sftp, scp, and piped, in that order [default]
+#transfer_method = smart
+
+# if False, sftp will not use batch mode to transfer files. This may cause some
+# types of file transfer failures impossible to catch however, and should
+# only be disabled if your sftp version has problems with batch mode
+#sftp_batch_mode = False
+
+[persistent_connection]
+
+# Configures the persistent connection timeout value in seconds.  This value is
+# how long the persistent connection will remain idle before it is destroyed.
+
+# If the connection doesn't receive a request before the timeout value
+
+# expires, the connection is shutdown.  The default value is 30 seconds.
+#connect_timeout = 30
+
+# Configures the persistent connection retries.  This value configures the
+# number of attempts the ansible-connection will make when trying to connect
+# to the local domain socket.  The default value is 30.
+#connect_retries = 30
+
+# Configures the amount of time in seconds to wait between connection attempts
+
+# to the local unix domain socket.  This value works in conjunction with the
+# connect_retries value to define how long to try to connect to the local
+# domain socket when setting up a persistent connection.  The default value is
+# 1 second.
+#connect_interval = 1
+
+[accelerate]
+#accelerate_port = 5099
+#accelerate_timeout = 30
+#accelerate_connect_timeout = 5.0
+
+# The daemon timeout is measured in minutes. This time is measured
+# from the last activity to the accelerate daemon.
+#accelerate_daemon_timeout = 30
+
+# If set to yes, accelerate_multi_key will allow multiple
+# private keys to be uploaded to it, though each user must
+# have access to the system via SSH to add a new key. The default
+# is "no".
+#accelerate_multi_key = yes
+
+[selinux]
+# file systems that require special treatment when dealing with security context
+# the default behaviour that copies the existing context or uses the user default
+# needs to be changed to use the file system dependent context.
+#special_context_filesystems=nfs,vboxsf,fuse,ramfs,9p
+
+# Set this to yes to allow libvirt_lxc connections to work without SELinux.
+#libvirt_lxc_noseclabel = yes
+
+[colors]
+#highlight = white
+#verbose = blue
+#warn = bright purple
+#error = red
+#debug = dark gray
+#deprecate = purple
+#skip = cyan
+#unreachable = red
+#ok = green
+#changed = yellow
+#diff_add = green
+#diff_remove = red
+#diff_lines = cyan
+
+[diff]
+# Always print diff when running ( same as always running with -D/--diff )
+# always = no
+
+# Set how many context lines to show in diff
+# context = 3
+{% endraw %}
\ No newline at end of file
diff --git a/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml
new file mode 100644
index 00000000..55d5b250
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/files/doctor/group_vars/all.yml
@@ -0,0 +1,14 @@
+{% raw %}
+doctor_project: doctor
+doctor_user: doctor
+doctor_pass: doctor
+doctor_role: _member_
+doctor_domain: Default
+doctor_network: doctor
+doctor_subnet: doctor
+doctor_cidr: "192.168.168.0/24"
+doctor_auth:
+  username: "{{ doctor_user }}"
+  password: "{{ doctor_pass }}"
+  project_name: "{{ doctor_project }}"
+{% endraw %}
diff --git a/resources/ansible_roles/qtip-generator/files/doctor/hosts b/resources/ansible_roles/qtip-generator/files/doctor/hosts
new file mode 100644
index 00000000..57b7932d
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/files/doctor/hosts
@@ -0,0 +1,2 @@
+[doctor-tester]
+localhost 	ansible_connection=local
diff --git a/resources/ansible_roles/qtip-generator/files/doctor/setup.yml b/resources/ansible_roles/qtip-generator/files/doctor/setup.yml
new file mode 100644
index 00000000..2a1f868d
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/files/doctor/setup.yml
@@ -0,0 +1,56 @@
+{% raw %}
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+- hosts: doctor-tester
+
+  gather_facts: no
+
+  tasks:
+
+  - name: creating doctor project
+    os_project:
+      name: "{{ doctor_project }}"
+      description: test project for doctor verification
+      domain: "{{ doctor_domain }}"
+      enabled: true
+
+  - name: creating doctor user
+    os_user:
+      name: "{{ doctor_user }}"
+      password: "{{ doctor_pass }}"
+      domain: "{{ doctor_domain }}"
+      default_project: "{{ doctor_project }}"
+
+  - name: assigning role to doctor user
+    os_user_role:
+      user: "{{ doctor_user }}"
+      role: "{{ doctor_role }}"
+      project: "{{ doctor_project }}"
+
+  - name: adding admin user to doctor project
+    os_user_role:
+      user: admin
+      role: admin
+      project: "{{ doctor_project }}"
+
+  - name: creating doctor network
+    os_network:
+      auth: "{{ doctor_auth }}"
+      name: "{{ doctor_network }}"
+
+  - name: creating doctor subnet
+    os_subnet:
+      auth: "{{ doctor_auth }}"
+      name: "{{ doctor_subnet }}"
+      cidr: "{{ doctor_cidr }}"
+      network_name: "{{ doctor_network }}"
+      enable_dhcp: false
+{% endraw %}
\ No newline at end of file
diff --git a/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml b/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml
new file mode 100644
index 00000000..7e21d5d2
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/files/doctor/teardown.yml
@@ -0,0 +1,40 @@
+{% raw %}
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+- hosts: localhost
+
+  gather_facts: no
+
+  tasks:
+
+  # Reverse order of setup
+  - name: removing doctor subnet
+    os_subnet:
+      auth: "{{ doctor_auth }}"
+      name: "{{ doctor_subnet }}"
+      state: absent
+
+  - name: creating doctor network
+    os_network:
+      auth: "{{ doctor_auth }}"
+      name: "{{ doctor_network }}"
+      state: absent
+
+  - name: removing doctor user
+    os_user:
+      name: "{{ doctor_user }}"
+      state: absent
+
+  - name: removing doctor project
+    os_project:
+      name: "{{ doctor_project }}"
+      state: absent
+{% endraw %}
diff --git a/resources/ansible_roles/qtip-workspace/hosts b/resources/ansible_roles/qtip-generator/hosts
index 2302edae..2302edae 100644
--- a/resources/ansible_roles/qtip-workspace/hosts
+++ b/resources/ansible_roles/qtip-generator/hosts
diff --git a/resources/ansible_roles/qtip-generator/main.yml b/resources/ansible_roles/qtip-generator/main.yml
new file mode 100644
index 00000000..2080e81f
--- /dev/null
+++ b/resources/ansible_roles/qtip-generator/main.yml
@@ -0,0 +1,17 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+- hosts: localhost
+
+  gather_facts: no
+
+  roles:
+
+    - role: qtip-generator
diff --git a/resources/ansible_roles/qtip-workspace/tasks/main.yml b/resources/ansible_roles/qtip-generator/tasks/main.yml
index 4fa60061..5188e0a8 100644
--- a/resources/ansible_roles/qtip-workspace/tasks/main.yml
+++ b/resources/ansible_roles/qtip-generator/tasks/main.yml
@@ -9,16 +9,16 @@
 
 - name: creating directories
   file:
-    path: "{{ cwd }}/{{ workspace }}/{{ item.path }}"
+    path: "{{ cwd }}/{{ project_name }}/{{ item.path }}"
     state: directory
     force: yes
-  with_filetree: template/
+  with_filetree: "{{ project_template }}/"
   when: item.state == 'directory'
 
 - name: templating files
   template:
     src: "{{ item.src }}"
-    dest: "{{ cwd }}/{{ workspace }}/{{ item.path }}"
+    dest: "{{ cwd }}/{{ project_name }}/{{ item.path }}"
     force: yes
-  with_filetree: template/
+  with_filetree: "{{ project_template }}/"
   when: item.state == 'file'
diff --git a/resources/ansible_roles/qtip-workspace/create.yml b/resources/ansible_roles/qtip-workspace/create.yml
deleted file mode 100644
index 4b06ebfa..00000000
--- a/resources/ansible_roles/qtip-workspace/create.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
----
-- hosts: localhost
-
-  gather_facts: no
-
-  roles:
-
-    - role: qtip-workspace
-
-      # modify or override variables to customize the workspace
-
-      # opnfv environment
-
-#      installer: apex         # <fuel|apex>
-#      installer_master_host: apex-virtual    # make sure you can login it with key authentication
-
-      # set testapi_url to enable reportint to testapi
-
-#      testapi_url: http://localhost:8000/api/v1
-
-      # report variables
-
-#      project_name: qtip
-#      case_name: compute
-#      pod_name: "{{ pod_name|default('qtip-pod') }}"
-#      scenario: "{{ scenario|default('generic') }}"
-#      version: master
-#      scenario: demo
-
-      # qtip settings
-
-      qtip_package: ../../..  # relative path from **workspace**, not current directory
diff --git a/tests/ci/run_ci.sh b/tests/ci/run_ci.sh
index 163adb39..fa2f2e34 100644
--- a/tests/ci/run_ci.sh
+++ b/tests/ci/run_ci.sh
@@ -67,7 +67,7 @@ esac
 
 cd /home/opnfv
 
-qtip create --pod ${pod_name} --installer ${installer_type} \
+qtip create --template compute --pod ${pod_name} --installer ${installer_type} \
 --master-host ${installer_ip} --scenario ${scenario} workspace
 
 cd /home/opnfv/workspace/