aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-06-28 15:26:45 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-06-28 17:12:22 +0800
commit76cb6b08ce04492bd02bec43487a82f99a0a2c5f (patch)
treef10e758da0ebb45cf6298d7a42211f26b6917deb
parent116b5101e8f917b23b49ad91f0a65fada76e8c5e (diff)
Fix bug in aggregation
Change-Id: Ic6613a9ab585894984e1cdab6ead3a84d1c4af9c Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
-rw-r--r--qtip/ansible_library/plugins/action/aggregate.py2
-rw-r--r--resources/ansible_roles/qtip/tasks/aggregate.yml2
-rw-r--r--tests/data/results/expected.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/qtip/ansible_library/plugins/action/aggregate.py b/qtip/ansible_library/plugins/action/aggregate.py
index 36ea0ef1..10565595 100644
--- a/qtip/ansible_library/plugins/action/aggregate.py
+++ b/qtip/ansible_library/plugins/action/aggregate.py
@@ -52,5 +52,5 @@ def aggregate(hosts, basepath, src):
'score': score,
'name': 'compute',
'description': 'POD Compute QPI',
- 'children': host_results
+ 'nodes': host_results
}
diff --git a/resources/ansible_roles/qtip/tasks/aggregate.yml b/resources/ansible_roles/qtip/tasks/aggregate.yml
index 904fc5d6..7f141c37 100644
--- a/resources/ansible_roles/qtip/tasks/aggregate.yml
+++ b/resources/ansible_roles/qtip/tasks/aggregate.yml
@@ -11,7 +11,7 @@
- name: aggregating results from all tested nodes
aggregate:
- group: compute
+ group: SUT
basepath: "{{ qtip_results }}/current"
src: "compute.json"
dest: "qpi.json"
diff --git a/tests/data/results/expected.json b/tests/data/results/expected.json
index e77200d4..f10e9e5d 100644
--- a/tests/data/results/expected.json
+++ b/tests/data/results/expected.json
@@ -1,6 +1,6 @@
{
"score": 150,
- "children": [
+ "nodes": [
{
"name": "host1",
"score": 100