Yair Zaslavsky has uploaded a new change for review. Change subject: webadmin: fix to shouldAlertUprade ......................................................................
webadmin: fix to shouldAlertUprade Change-Id: I923e5eac5fb135e0c35cf318d36852ce155011d4 Signed-off-by: Yair Zaslavsky <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java 1 file changed, 23 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/18486/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 3b0283e..df60bc0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -17,6 +17,7 @@ import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.businessentities.VDSType; import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; +import org.ovirt.engine.core.common.utils.RpmVersionUtils; import org.ovirt.engine.core.compat.RpmVersion; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.core.compat.Version; @@ -669,36 +670,31 @@ public boolean shouldAlertUpgrade(ArrayList<RpmVersion> isos, String [] hostOs) { boolean alert = false; + Version hostVersion = new Version(hostOs[1].trim()); + //String version_host[] = hostOs[1].split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ + String release_host = hostOs[2].trim(); - String version_host[] = hostOs[1].split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ - String release_host[] = hostOs[2].split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ - - for (RpmVersion iso: isos) { + for (RpmVersion iso : isos) { // Major check - if (Integer.parseInt(version_host[0].trim()) == iso.getMajor()) { - // Minor and Build - if (iso.getMinor() > Integer.parseInt(version_host[1].trim()) || - iso.getBuild() > Integer.parseInt(version_host[2].trim())) { - alert = true; - break; - } + if (hostVersion.getMajor() == iso.getMajor()) { + // Minor and Build + if (iso.getMinor() > hostVersion.getMinor() || + iso.getBuild() > hostVersion.getBuild()) { + alert = true; + break; + } - if (Integer.toString(iso.getRevision()).length() > release_host[0].length()) { - alert = true; - break; - } - - String releaseISO [] = Integer.toString(iso.getRevision()).split("\\."); //$NON-NLS-1$ //$NON-NLS-2$ - for (int i=0; i < release_host.length; i++) { - try { - if (Integer.parseInt(releaseISO[i].trim()) > Integer.parseInt(release_host[i].trim())) { - alert = true; - break; - } - } catch (NumberFormatException e) { - break; - } - } + String rpmFromIso = iso.getRpmName(); + // Removes the ".iso" file extension , and get the release part from it + int isoIndex = iso.getRpmName().indexOf(".iso"); //$NON-NLS-1$ + if (isoIndex != -1) { + rpmFromIso = iso.getRpmName().substring(0, isoIndex); + } + String rpmRelease = RpmVersionUtils.splitRpmToParts(rpmFromIso)[2]; + if (RpmVersionUtils.compareRpmPart(rpmRelease, release_host) > 0) { + alert = true; + break; + } } } return alert; -- To view, visit http://gerrit.ovirt.org/18486 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I923e5eac5fb135e0c35cf318d36852ce155011d4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
