Change in ovirt-engine[master]: restapi: Fix possible version mismatch (#1206068)
Ori Liel has submitted this change and it was merged.
Change subject: restapi: Fix possible version mismatch (#1206068)
......................................................................
restapi: Fix possible version mismatch (#1206068)
GET on the root of the API returns:
<api>
.
.
<version>...</version>
<full_version>...</full_version>
</api>
The first is taken from vdc_options-->VdcVersion.
The second is taken from vdc_options-->ProductRPMVersion.
Sometimes the second value is more accurate and there can be a mismatch.
This patch adds a query to the engine that gets the product version.
The query attempst to parse ProductRPMVersion and use it for both fields.
If parsing fails, VdcVersion is used as fall-back.
Bug-Url: https://bugzilla.redhat.com/1206068
Change-Id: I1bd123c2352db229e52bdbd3f1e2db4ac72018a9
Signed-off-by: Ori Liel <oliel(a)redhat.com>
---
A
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProductVersionQuery.java
A
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetProductVersionQueryTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VersionMapper.java
6 files changed, 151 insertions(+), 20 deletions(-)
Approvals:
Ori Liel: Verified; Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/40085
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bd123c2352db229e52bdbd3f1e2db4ac72018a9
Gerrit-PatchSet: 5
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Gerri T. Hooks <gerrithooks(a)gmail.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Ori Liel <oliel(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org