Douglas Schilling Landgraf has uploaded a new change for review. Change subject: REST: ProductInfo use ProductRPMVersion ......................................................................
REST: ProductInfo use ProductRPMVersion Frontend uses ProductRPMVersion from vdc_options to provide version data and REST uses VdcVersion for the same info. This patch will make REST use ProductRPMVersion to provide version fields and includes setFullVersion. Change-Id: Ie5c03460ef1af943278ab6f5171c042afdf4d392 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=905398 Signed-off-by: Douglas Schilling Landgraf <dougsl...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/VersionHelper.java 2 files changed, 14 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/13420/1 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..5f2dbc6 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 @@ -350,7 +350,7 @@ } private RSDL addSystemVersion(RSDL rsdl) { - rsdl.setVersion(VersionHelper.parseVersion(getConfigurationValueDefault(String.class, ConfigurationValues.VdcVersion))); + rsdl.setVersion(VersionHelper.parseVersion(getConfigurationValueDefault(String.class, ConfigurationValues.ProductRPMVersion))); return rsdl; } @@ -379,10 +379,11 @@ } private API addSystemVersion(API api) { + String ProductInfo = getConfigurationValue(String.class, ConfigurationValues.ProductRPMVersion, null); api.setProductInfo(new ProductInfo()); api.getProductInfo().setName("oVirt Engine"); api.getProductInfo().setVendor("ovirt.org"); - api.getProductInfo().setVersion(VersionHelper.parseVersion(getConfigurationValueDefault(String.class, ConfigurationValues.VdcVersion))); + api.getProductInfo().setVersion(VersionHelper.parseVersion(ProductInfo)); return api; } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/VersionHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/VersionHelper.java index 9c1fe71..1389197 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/VersionHelper.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/VersionHelper.java @@ -12,16 +12,19 @@ public static Version parseVersion(String text) { Version version = new Version(); String parts[] = text.split("\\.", -1); - switch (parts.length) { - case 4: - version.setRevision(Integer.parseInt(parts[3])); - case 3: + + version.setFullVersion(text); + version.setMajor(Integer.parseInt(parts[0])); + version.setMinor(Integer.parseInt(parts[1])); + + if (parts[2].contains("-")) { + version.setBuild(Integer.parseInt(parts[2].split("-")[0])); + } else { version.setBuild(Integer.parseInt(parts[2])); - case 2: - version.setMinor(Integer.parseInt(parts[1])); - case 1: - version.setMajor(Integer.parseInt(parts[0])); } + + version.setRevision(Integer.parseInt(parts[3])); + return version; } -- To view, visit http://gerrit.ovirt.org/13420 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie5c03460ef1af943278ab6f5171c042afdf4d392 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <dougsl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
