From: zhihui wu <wu.zhihui1@zte.com.cn>
Date: Mon, 26 Feb 2018 02:27:29 +0000 (+0800)
Subject: Adapter "installer_type" for reporting
X-Git-Tag: opnfv-6.0.0~27
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=70378064802c96afbfde607e95012b7dcd0299ed;p=qtip.git

Adapter "installer_type" for reporting

mcp is regarded as fuel in opnfv testresult reporting, but they are
different tools for QTIP. so convert "mcp" to "fuel" before reporting.

Change-Id: I5a90828b4583fe734beb80283734966d9ece1852
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
---

diff --git a/resources/ansible_roles/opnfv-testapi/tasks/report.yml b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
index 0633eafb..6db3a785 100644
--- a/resources/ansible_roles/opnfv-testapi/tasks/report.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/report.yml
@@ -21,7 +21,7 @@
       project_name: "{{ project_name }}"
       case_name: "{{ case_name }}"
       pod_name: "{{ pod_name }}"
-      installer: "{{ installer_type }}"
+      installer: "{{ installer_type_adapter[installer_type] }}"
       version: "{{ version }}"
       scenario: "{{ scenario }}"
       start_date: "{{ ansible_date_time.date }}"
diff --git a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
index cc587c69..7f339045 100644
--- a/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
+++ b/resources/ansible_roles/qtip-generator/files/compute/host_vars/localhost.yml
@@ -14,3 +14,9 @@ case_name: "{{ case_name|default('compute') }}"
 pod_name: "{{ pod_name|default('qtip-pod') }}"
 scenario: "{{ scenario|default('generic') }}"
 version: "{{ lookup('env','OPNFV_RELEASE')|default('master') }}"
+
+installer_type_adapter:
+  fuel: fuel
+  mcp: fuel
+  apex: apex
+  manual: manual
\ No newline at end of file