From 26c2a8f2d556a8777d443b02d931e7df7fec8f6c Mon Sep 17 00:00:00 2001
From: zhihui wu <wu.zhihui1@zte.com.cn>
Date: Fri, 2 Jun 2017 16:07:24 +0800
Subject: add system_info and condition to qpi report

According to the part "system_info" and "condition" in spec, gather
these data and add them to qpi report.

Change-Id: I5efc996c2bfb34452e9aa323d8288c1dd2d8d276
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
---
 resources/QPI/compute-baseline.json              |  8 ++++----
 resources/QPI/compute.yaml                       | 13 +++++++++++++
 resources/ansible_roles/qtip/tasks/calculate.yml |  1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'resources')

diff --git a/resources/QPI/compute-baseline.json b/resources/QPI/compute-baseline.json
index 25378d10..33f711d2 100644
--- a/resources/QPI/compute-baseline.json
+++ b/resources/QPI/compute-baseline.json
@@ -8,12 +8,12 @@
     "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": {
+    "kernel": "4.4.0-72-generic x86_64 (64 bit)",
     "cpu_speed": "1200/3000 MHz",
     "memory": "4062.3/128524.1MB",
-    "disk": "1200.3GB (0.9% used)",
+    "disk": "1200.3GB (0.9% used)"
+  },
+  "condition": {
     "installer": "Fuel",
     "scenario": "os-nosdn-nofeature-ha"
   },
diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml
index d27d769b..05620269 100644
--- a/resources/QPI/compute.yaml
+++ b/resources/QPI/compute.yaml
@@ -8,6 +8,19 @@
 ##############################################################################
 name: compute
 description: QTIP Performance Index of compute
+system_info:
+  - name: product
+    description: production commercial name
+  - name: cpu
+    description: cpu brand
+  - name: os
+    description: operating system version
+  - name: kernel
+    description: the core of a computer's operating system
+  - name: memory
+    description: memory usage
+  - name: disk
+    description: disk usage
 formula: weighted arithmetic mean
 sections: # split based on different application
   - name: SSL
diff --git a/resources/ansible_roles/qtip/tasks/calculate.yml b/resources/ansible_roles/qtip/tasks/calculate.yml
index 61e96faf..c472ee34 100644
--- a/resources/ansible_roles/qtip/tasks/calculate.yml
+++ b/resources/ansible_roles/qtip/tasks/calculate.yml
@@ -18,6 +18,7 @@
       intmem: "{{ qtip_results }}/memory/integer-metrics.json"
       floatmem: "{{ qtip_results }}/memory/float-metrics.json"
       arithmetic: "{{ qtip_results }}/arithmetic/metrics.json"
+    sysinfo: "{{ qtip_results }}/sysinfo/condition.json"
     spec:   "{{ qtip_resources }}/QPI/compute.yaml"
     baseline: "{{ qtip_resources }}/QPI/compute-baseline.json"
     dest: "{{ qtip_results }}/compute.json"
-- 
cgit 1.2.3-korg