Douglas Schilling Landgraf has uploaded a new change for review. Change subject: restapi: provide full_version in product_info ......................................................................
restapi: provide full_version in product_info Frontend uses ProductRPMVersion from vdc_options to show Engine version. This patch will include a new element called full_version into ProductInfo xsd schema, which will provide to users the same version info from Frontend. Change-Id: I9102b3121154e1ba2096ec8b54765c6bfc6a97f1 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=905398 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd 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 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/14079/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index b0dc308..3e95623 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -505,6 +505,7 @@ <xs:sequence> <xs:element name="vendor" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element type="Version" name="version" minOccurs="0" maxOccurs="1"/> + <xs:element name="full_version" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java index 6199c6b..72e4d8e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java @@ -379,9 +379,12 @@ } private API addSystemVersion(API api) { + String productVersion = getConfigurationValueDefault(String.class, + ConfigurationValues.ProductRPMVersion); api.setProductInfo(new ProductInfo()); api.getProductInfo().setName("oVirt Engine"); api.getProductInfo().setVendor("ovirt.org"); + api.getProductInfo().setFullVersion(productVersion); api.getProductInfo().setVersion(VersionHelper.parseVersion(getConfigurationValueDefault(String.class, ConfigurationValues.VdcVersion))); return api; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java index d5f5070..b75440b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java @@ -311,6 +311,7 @@ assertContainsBlankTemplate(api.getSpecialObjects()); assertNotNull(api.getProductInfo()); assertNotNull(api.getProductInfo().getVersion()); + assertNotNull(api.getProductInfo().getFullVersion()); assertEquals(MAJOR, api.getProductInfo().getVersion().getMajor().intValue()); assertEquals(MINOR, api.getProductInfo().getVersion().getMinor().intValue()); assertEquals(BUILD, api.getProductInfo().getVersion().getBuild().intValue()); @@ -408,6 +409,8 @@ VdcQueryReturnValue queryResult = createMock(VdcQueryReturnValue.class); expect(backend.RunQuery(eq(VdcQueryType.GetConfigurationValue), queryVdcVersionParams())).andReturn(queryResult); + expect(backend.RunQuery(eq(VdcQueryType.GetConfigurationValue), + queryProductRPMVersionParams())).andReturn(queryResult); expect(queryResult.getSucceeded()).andReturn(true).anyTimes(); expect(queryResult.getReturnValue()).andReturn(SYSTEM_VERSION).anyTimes(); @@ -424,6 +427,12 @@ replayAll(); } + protected VdcQueryParametersBase queryProductRPMVersionParams() { + return eqQueryParams(GetConfigurationValueParameters.class, + new String[] { "SessionId"}, + new Object[] { getSessionId() }); + } + protected VdcQueryParametersBase queryVdcVersionParams() { return eqQueryParams(GetConfigurationValueParameters.class, new String[] { "SessionId"}, -- To view, visit http://gerrit.ovirt.org/14079 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9102b3121154e1ba2096ec8b54765c6bfc6a97f1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
