Change in ovirt-engine[master]: frontend: node upgrade detection improvement

yzaslavs at redhat.com yzaslavs at redhat.com
Tue Aug 27 17:53:19 UTC 2013


Yair Zaslavsky has submitted this change and it was merged.

Change subject: frontend:  node upgrade detection improvement
......................................................................


frontend:  node upgrade detection improvement

In commit 5233548 the comparison failed because revision strings
from the node's OS might contain extra digits in the date like 20130212.0.

This patch parses the string from vds.getHostOs() as shown below
and splits it into major, minor, build and revision. However, in the revision
field it compares each segment delimited by dots and makes a comparison
between the node's OS and the ISO until it reaches a letter,
like "fc18" or "el6", which is derived from the rpm.

oVirt Node - 2.6.0 - 20130212.0.fc18
oVirt Node - 2.6.0 - 20130212.fc18
oVirt Node - 3.0.0 - 5.0.5.vdsm.fc19
RHEV Hypervisor - 6.4 - 20130709.0.el6_4
RHEV Hypervisor - 6.4 - 20130709.0.el6_4

Change-Id: I76bd2948524110ec80923e855bd1f49e09e17046
Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
Signed-off-by: Yair Zaslavsky <yzaslavs at redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java
1 file changed, 40 insertions(+), 14 deletions(-)

Approvals:
  Yair Zaslavsky: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/17987
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I76bd2948524110ec80923e855bd1f49e09e17046
Gerrit-PatchSet: 20
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay at gmail.com>
Gerrit-Reviewer: Barak Azulay <bazulay at redhat.com>
Gerrit-Reviewer: Doron Fediuck <dfediuck at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server



More information about the Engine-commits mailing list