Timothy Asir has uploaded a new change for review.
Change subject: gluster: Add rhs version if available
......................................................................
gluster: Add rhs version if available
Currently engine shows only glusterfs version.
This patch addes seperate field for rhs version in the
table and reterives rhs version from vdsm if availabe
and displays in the engine ui
Change-Id: I395877a528e7cac7ff4c526a200c64b7c808167d
Signed-off-by: Timothy Asir Jeyasingh <tjeya...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java
A packaging/dbscripts/upgrade/03_06_1280_add_rhs_version_to_vds_dynamic.sql
11 files changed, 61 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/40361/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 1e379ff..e3ff3f2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -181,6 +181,7 @@
vds.setKvmVersion(getKvmVersion());
vds.setLibvirtVersion(getLibvirtVersion());
vds.setGlusterVersion(getGlusterVersion());
+ vds.setRHSVersion(getRHSVersion());
vds.setHooksStr(getHooksStr());
vds.setActiveNic(getActiveNic());
vds.setPowerManagementControlledByPolicy(isPowerManagementControlledByPolicy());
@@ -979,6 +980,14 @@
vdsDynamic.setGlusterVersion(value);
}
+ public String getRHSVersion() {
+ return VdsDynamic.getRHSVersion();
+ }
+
+ public void setRHSVersion(String value) {
+ VdsDynamic.setRHSVersion(value);
+ }
+
public String getKernelVersion() {
return vdsDynamic.getKernelVersion();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
index dab637d..6d23d45 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
@@ -87,6 +87,8 @@
private RpmVersion glusterVersion;
+ private String rhsVersion;
+
private String kernelVersion;
private String iScsiInitiatorName;
@@ -558,6 +560,14 @@
glusterVersion = value;
}
+ public String getRHSVersion() {
+ return rhsVersion;
+ }
+
+ public void setRHSVersion(String value) {
+ rhsVersion = value;
+ }
+
public String getBuildName() {
return buildName;
}
@@ -734,6 +744,7 @@
result = prime * result + (softwareVersion == null ? 0 :
softwareVersion.hashCode());
result = prime * result + (spiceVersion == null ? 0 :
spiceVersion.hashCode());
result = prime * result + (glusterVersion == null ? 0 :
glusterVersion.hashCode());
+ result = prime * result + ((rhsVersion == null) ? 0 :
rhsVersion.hashCode());
result = prime * result + (status == null ? 0 : status.hashCode());
result = prime * result + (supportedClusterLevels == null ? 0 :
supportedClusterLevels.hashCode());
result = prime * result + (supportedEngines == null ? 0 :
supportedEngines.hashCode());
@@ -807,6 +818,7 @@
&& ObjectUtils.objectsEqual(getSoftwareVersion(),
other.getSoftwareVersion())
&& ObjectUtils.objectsEqual(spiceVersion, other.spiceVersion)
&& ObjectUtils.objectsEqual(glusterVersion,
other.glusterVersion)
+ && ObjectUtils.objectsEqual(rhsVersion, other.rhsVersion)
&& status == other.status
&& ObjectUtils.objectsEqual(supportedClusterLevels,
other.supportedClusterLevels)
&& ObjectUtils.objectsEqual(supportedEngines,
other.supportedEngines)
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index 97707c4..07b921c 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -341,6 +341,7 @@
entity.setVdsGroupSupportsGlusterService(rs.getBoolean("vds_group_gluster_service"));
entity.setHostOs(rs.getString("host_os"));
entity.setGlusterVersion(new
RpmVersion(rs.getString("gluster_version")));
+ entity.setRHSVersion(rs.getString("rhs_version"));
entity.setKvmVersion(rs.getString("kvm_version"));
entity.setLibvirtVersion(new
RpmVersion(rs.getString("libvirt_version")));
entity.setSpiceVersion(rs.getString("spice_version"));
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
index 3ab7040..0a9973c 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java
@@ -88,6 +88,7 @@
entity.setLibvirtVersion(new
RpmVersion(rs.getString("libvirt_version")));
entity.setSpiceVersion(rs.getString("spice_version"));
entity.setGlusterVersion(new
RpmVersion(rs.getString("gluster_version")));
+ entity.setRHSVersion(rs.getString("rhs_version"));
entity.setKernelVersion(rs.getString("kernel_version"));
entity.setIScsiInitiatorName(rs
.getString("iscsi_initiator_name"));
@@ -242,6 +243,7 @@
.addValue("libvirt_version",
vds.getLibvirtVersion().getRpmName())
.addValue("spice_version", vds.getSpiceVersion())
.addValue("gluster_version",
vds.getGlusterVersion().getRpmName())
+ .addValue("rhs_version", vds.getRHSVersion())
.addValue("kernel_version", vds.getKernelVersion())
.addValue("iscsi_initiator_name", vds.getIScsiInitiatorName())
.addValue("transparent_hugepages_state",
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
index e16defb..11ac1a5 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDynamicDAOTest.java
@@ -121,6 +121,16 @@
}
@Test
+ public void testRHSVersion() {
+ String RHSVersion = "rhel-6.6.0.2.el6";
+ VdsDynamic before = dao.get(existingVds.getId());
+ before.setRHSVersion(RHSVersion);
+ dao.update(before);
+ VdsDynamic after = dao.get(existingVds.getId());
+ assertEquals(RHSVersion, after.getRHSVersion());
+ }
+
+ @Test
public void testSmartUpdatePartialVds() {
int vmCount = 1;
int pendingVcpusCount = 5;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index 610da89..416dbeb 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -754,6 +754,10 @@
vds.setHostOs(GetPackageVersionFormated(
(Map<String, Object>)
xmlRpcStruct.get(VdsProperties.host_os), true));
}
+ if (xmlRpcStruct.containsKey(VdsProperties.RHS_VERSION)) {
+ vds.setRHSVersion(GetPackageVersionFormated(
+ (Map<String, Object>)
xmlRpcStruct.get(VdsProperties.RHS_VERSION), false));
+ }
if (xmlRpcStruct.containsKey(VdsProperties.packages)) {
// packages is an array of xmlRpcStruct (that each is a name, ver,
// release.. of a package)
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
index 78e3785..56eb856 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
@@ -172,6 +172,7 @@
public static final String vdsmPackageName = "vdsm";
public static final String spiceServerPackageName = "spice-server";
public static final String GLUSTER_PACKAGE_NAME = "glusterfs";
+ public static final String RHS_VERSION = "rhsVersion";
// Addressing related strings
public static final String Controller = "controller";
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 e71d320..5bfdfd1 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
@@ -222,6 +222,20 @@
}
}
+ private String rhsVersion;
+
+ public String getRHSVersion() {
+ return rhsVersion;
+ }
+
+ public void setRHSVersion(String value) {
+ if (!ObjectUtils.objectsEqual(rhsVersion, value))
+ {
+ rhsVersion = value;
+ onPropertyChanged(new PropertyChangedEventArgs("rhsVersion"));
//$NON-NLS-1$
+ }
+ }
+
private String iScsiInitiatorName;
public String getIScsiInitiatorName()
@@ -953,6 +967,7 @@
setVdsmVersion(vds.getVersion());
setSpiceVersion(vds.getSpiceVersion());
setGlusterVersion(vds.getGlusterVersion());
+ setRHSVersion(vds.getRHSVersion());
setIScsiInitiatorName(vds.getIScsiInitiatorName());
setSpmPriorityValue(vds.getVdsSpmPriority());
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 8a666c7..f113a9c 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -1597,6 +1597,9 @@
@DefaultStringValue("GlusterFS Version")
String glusterVersionHostGeneral();
+ @DefaultStringValue("RHS Version")
+ String rhsVersionHostGeneral();
+
@DefaultStringValue("iSCSI Initiator Name")
String isciInitNameHostGeneral();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java
index 5927b60..4a5d9ab 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralSoftwareView.java
@@ -54,6 +54,7 @@
TextBoxLabel kernelVersion = new TextBoxLabel();
VersionTextBoxLabel glusterVersion = new VersionTextBoxLabel();
VersionTextBoxLabel vdsmVersion = new VersionTextBoxLabel();
+ TextBoxLabel rhsVersion = new TextBoxLabel();
@UiField(provided = true)
@WithElementId
@@ -77,7 +78,7 @@
boolean glusterSupported =
ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly);
// Build a form using the FormBuilder
- formBuilder = new FormBuilder(formPanel, 1, 7);
+ formBuilder = new FormBuilder(formPanel, 1, 8);
formBuilder.setRelativeColumnWidth(0, 3);
formBuilder.addFormItem(new FormItem(constants.osVersionHostGeneral(),
oS, 0).withAutoPlacement());
formBuilder.addFormItem(new
FormItem(constants.kernelVersionHostGeneral(), kernelVersion,
0).withAutoPlacement());
@@ -86,6 +87,7 @@
formBuilder.addFormItem(new
FormItem(constants.vdsmVersionHostGeneral(), vdsmVersion,
0).withAutoPlacement());
formBuilder.addFormItem(new
FormItem(constants.spiceVersionHostGeneral(), spiceVersion, 0,
virtSupported).withAutoPlacement());
formBuilder.addFormItem(new
FormItem(constants.glusterVersionHostGeneral(), glusterVersion, 0,
glusterSupported).withAutoPlacement());
+ formBuilder.addFormItem(new
FormItem(constants.rhsVersionHostGeneral(), rhsVersion, 0,
glusterSupported).withAutoPlacement());
}
@Override
diff --git
a/packaging/dbscripts/upgrade/03_06_1280_add_rhs_version_to_vds_dynamic.sql
b/packaging/dbscripts/upgrade/03_06_1280_add_rhs_version_to_vds_dynamic.sql
new file mode 100644
index 0000000..3cae1a7
--- /dev/null
+++ b/packaging/dbscripts/upgrade/03_06_1280_add_rhs_version_to_vds_dynamic.sql
@@ -0,0 +1 @@
+select fn_db_add_column('vds_dynamic', 'rhs_version', 'varchar(4000)');
--
To view, visit https://gerrit.ovirt.org/40361
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I395877a528e7cac7ff4c526a200c64b7c808167d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Timothy Asir <tjeya...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
