Fix bug in aggregation

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

diff --git a/qtip/ansible_library/plugins/action/aggregate.py b/qtip/ansible_library/plugins/action/aggregate.py
index 36ea0ef..1056559 100644 (file)
--- 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 904fc5d..7f141c3 100644 (file)
--- 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 e77200d..f10e9e5 100644 (file)
--- a/tests/data/results/expected.json
+++ b/tests/data/results/expected.json
@@ -1,6 +1,6 @@
 {
   "score": 150,
-  "children": [
+  "nodes": [
     {
       "name": "host1",
       "score": 100