summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtip/ansible_library/plugins/action/calculate.py2
-rw-r--r--resources/QPI/compute.yaml4
-rw-r--r--resources/ansible_roles/unixbench/templates/arithmetic-metrics.j24
-rw-r--r--tests/unit/ansible_library/plugins/action/calculate_test.py4
4 files changed, 7 insertions, 7 deletions
diff --git a/qtip/ansible_library/plugins/action/calculate.py b/qtip/ansible_library/plugins/action/calculate.py
index d50222fe..077d863c 100644
--- a/qtip/ansible_library/plugins/action/calculate.py
+++ b/qtip/ansible_library/plugins/action/calculate.py
@@ -69,7 +69,7 @@ def calc_qpi(qpi_spec, metrics):
'children': section_results,
'details': {
'metrics': metrics,
- 'spec': qpi_spec
+ 'spec': "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml"
}
}
diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml
index 63ac5f5c..d27d769b 100644
--- a/resources/QPI/compute.yaml
+++ b/resources/QPI/compute.yaml
@@ -84,6 +84,6 @@ sections: # split based on different application
- name: arithmetic
workloads:
- name: dhrystone_lps
- baseline: 2495.9
- - name: whetstone_MWIPS
baseline: 34657490.5
+ - name: whetstone_MWIPS
+ baseline: 2495.9
diff --git a/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2 b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2
index a12eb0ab..c2c4c3b2 100644
--- a/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2
+++ b/resources/ansible_roles/unixbench/templates/arithmetic-metrics.j2
@@ -1,5 +1,5 @@
Arithmetic
==========
-{{ ('Floating-point (Whetstone MWIPS)', arithmetic_metrics.dhrystone_lps[0])|justify }}
-{{ ('Integer (Dhyrstone lps)', arithmetic_metrics.whetstone_MWIPS[0])|justify }}
+{{ ('Floating-point (Whetstone MWIPS)', arithmetic_metrics.whetstone_MWIPS[0])|justify }}
+{{ ('Integer (Dhyrstone lps)', arithmetic_metrics.dhrystone_lps[0])|justify }}
diff --git a/tests/unit/ansible_library/plugins/action/calculate_test.py b/tests/unit/ansible_library/plugins/action/calculate_test.py
index 31d72120..fae59821 100644
--- a/tests/unit/ansible_library/plugins/action/calculate_test.py
+++ b/tests/unit/ansible_library/plugins/action/calculate_test.py
@@ -69,13 +69,13 @@ def section_result(metric_result):
@pytest.fixture()
-def qpi_result(qpi_spec, section_result, metrics):
+def qpi_result(section_result, metrics):
return {'score': 2048,
'name': 'compute',
'description': 'QTIP Performance Index of compute',
'children': [section_result],
'details': {
- 'spec': qpi_spec,
+ 'spec': "https://git.opnfv.org/qtip/tree/resources/QPI/compute.yaml",
'metrics': metrics}}