Michael Pasternak has uploaded a new change for review. Change subject: Revert "restapi: provide full_version in product_info" ......................................................................
Revert "restapi: provide full_version in product_info" Reverted due to junit failures This reverts commit a853f738895e04ec6db4a7e2a1f2e2df31eab177. Change-Id: Ie291b936b9ffaebb555fd6a4e80f26a410e0f90d Signed-off-by: Michael Pasternak <[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 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/14034/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 3e95623..b0dc308 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,7 +505,6 @@ <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 72e4d8e..6199c6b 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,12 +379,9 @@ } 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; } -- To view, visit http://gerrit.ovirt.org/14034 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie291b936b9ffaebb555fd6a4e80f26a410e0f90d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
