Organize **all** tasks into ansible role `qtip`

Change-Id: I5d3852d2a31e9c4043191377e5cb7d539d222a8c
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

2 files changed, 18 insertions, 87 deletions

diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
index 31969281..b76e4573 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/run.yml
@@ -8,74 +8,38 @@
 ##############################################################################
 
 ---
-# Execute compute benchmark plan and collect data
-# - system information
-# - test condition
-# - performance metrics
 
 - hosts: localhost
-  tasks:
-  - name: setting result directory name
-    set_fact:
-      qtip_results_base: "{{ qtip_results }}/{{ pod_name }}-{{ lookup('pipe', 'date +%Y%m%d-%H%M') }}"
 
-- hosts: compute
-
-  pre_tasks:
-
-  - name: check ssh connection
-    ping:
+  roles:
+  # prepare local environment
+  - { role: qtip, tasks: setup-local }
 
-  - name: overriding result directory name
-    set_fact:
-      qtip_results: "{{ hostvars['localhost']['qtip_results_base']}}/{{ inventory_hostname }}"
 
-  - name: create result directory
-    file:
-      path: "{{ qtip_results }}"
-      state: directory
-    delegate_to: localhost
+- hosts: compute
 
   roles:
-  - qtip-deps
-
-  tags: [setup]
+  # prepare environment
+  - { role: qtip, tasks: setup-node }
 
 
 - hosts: compute
 
   roles:
-
+  # run test and collect metrics
     - { role: inxi, tags: [inxi, sysinfo] }
     - { role: unixbench, tags: [unixbench, float, int] }
     - { role: openssl, tags: [openssl, ssl]}
     - { role: nDPI, tags: [ndpi, dpi]}
     - { role: ramspeed, tags: [ramspeed, mem]}
-
-  post_tasks:
-  - name: calculate QPI of compute
-    calculate:
-      metrics:
-        ssl_rsa: "{{ ssl_rsa_metrics }}"
-      spec:   "{{ qtip_resources }}/QPI/compute.yaml"
-    register: qpi_result
-    delegate_to: localhost
-    tags: [qpi]
+  # calculate scores
+    - { role: qtip, tasks: calculate}
 
 
 - hosts: localhost
 
-  pre_tasks:
-
-  - name: aggregate QPI results from all tested nodes
-    aggregate:
-      group: compute
-    register: pod_result
-    tags: [pod]
-
-  # Generate and publish report
-
   roles:
-    - role: opnfv-testapi
-      action: report
-      when: testapi_url is defined
+  # aggregate results and produce report
+    - { role: qtip, tasks: aggregate }
+  # publish results
+    - { role: opnfv-testapi, tasks: report, when: testapi_url is defined}
diff --git a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
index 5b4677e9..a522d67b 100644
--- a/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
+++ b/resources/ansible_roles/qtip-workspace/files/defaults/setup.yml
@@ -8,43 +8,10 @@
 ##############################################################################
 
 # Prepare connection to SUT (System Under Test)
-- hosts: fuel-masters
-  gather_facts: no
-  tasks:
-  - name: collect facts of fuel hosts
-    fuel:
-
-- hosts: apex-underclouds
-  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 }}"
+---
 
-- hosts:
-  - fuel-masters
-  - apex-underclouds
-  tasks:
-  - name: update inventory file
-    template: src=templates/hosts dest=./hosts
-    delegate_to: localhost
-  - name: update ssh.cfg file
-    template: src=templates/ssh.cfg dest=./ssh.cfg
-    delegate_to: localhost
-
-- hosts: localhost
-  tasks:
-  - name: create cache directory
-    file:
-      path: "{{ item }}"
-      state: directory
-    with_items:
-      - "{{ qtip_cache }}"
+- hosts: [fuel-masters, apex-underclouds]
+  gather_facts: no
+  roles:
+    - { role: qtip, tasks: generate-inventory }