From 76cb6b08ce04492bd02bec43487a82f99a0a2c5f Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Wed, 28 Jun 2017 15:26:45 +0800 Subject: Fix bug in aggregation Change-Id: Ic6613a9ab585894984e1cdab6ead3a84d1c4af9c Signed-off-by: Yujun Zhang --- qtip/ansible_library/plugins/action/aggregate.py | 2 +- resources/ansible_roles/qtip/tasks/aggregate.yml | 2 +- tests/data/results/expected.json | 2 +- 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 -- cgit 1.2.3-korg