Moti Asayag has uploaded a new change for review. Change subject: engine: Extends Vds Dynamic with updates_available ......................................................................
engine: Extends Vds Dynamic with updates_available The new attribute serves as indication for the availability of updates on the host to be installed. Change-Id: I7c788b17cb58791fe540b7130965a210557e68a5 Bug-Url: https://bugzilla.redhat.com/1157368 Signed-off-by: Moti Asayag <masa...@redhat.com> --- 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/VdsDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml A packaging/dbscripts/upgrade/03_06_1220_add_updates_available_to_vds_dynamic.sql 4 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/62/39862/1 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..c681753 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 @@ -162,6 +162,8 @@ private String maintenanceReason; + private boolean updatesAvailable; + public VdsDynamic() { rpmVersion = new RpmVersion(); libvirtVersion = new RpmVersion(); @@ -698,6 +700,14 @@ this.maintenanceReason = maintenanceReason; } + public boolean getUpdatesAvailable() { + return updatesAvailable; + } + + public void setUpdatesAvaiable(boolean updatesAvailable) { + this.updatesAvailable = updatesAvailable; + } + @Override public int hashCode() { final int prime = 31; @@ -762,6 +772,7 @@ result = prime * result + (liveSnapshotSupport ? 0 : 1); result = prime * result + (liveMergeSupport ? 0 : 1); result = prime * result + (maintenanceReason == null ? 0 : maintenanceReason.hashCode()); + result = prime * result + (updatesAvailable ? 0 : 1); return result; } @@ -836,6 +847,7 @@ && ObjectUtils.objectsEqual(supportedRngSources, other.supportedRngSources) && liveSnapshotSupport == other.liveSnapshotSupport && liveMergeSupport == other.liveMergeSupport - && ObjectUtils.objectsEqual(maintenanceReason, other.maintenanceReason); + && ObjectUtils.objectsEqual(maintenanceReason, other.maintenanceReason) + && updatesAvailable == other.updatesAvailable; } } 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..351aa0b 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 @@ -113,6 +113,7 @@ entity.setSupportedEmulatedMachines(rs.getString("supported_emulated_machines")); entity.getSupportedRngSources().addAll(VmRngDevice.csvToSourcesSet(rs.getString("supported_rng_sources"))); entity.setMaintenanceReason(rs.getString("maintenance_reason")); + entity.setUpdatesAvaiable(rs.getBoolean("is_update_available")); return entity; } } @@ -267,7 +268,8 @@ .addValue("supported_emulated_machines", vds.getSupportedEmulatedMachines()) .addValue("is_live_snapshot_supported", vds.getLiveSnapshotSupport()) .addValue("is_live_merge_supported", vds.getLiveMergeSupport()) - .addValue("maintenance_reason", vds.getMaintenanceReason()); + .addValue("maintenance_reason", vds.getMaintenanceReason()) + .addValue("is_update_available", vds.getUpdatesAvailable()); return parameterSource; } diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index d0c2eb9..8a64b70 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -3260,6 +3260,7 @@ <column>maintenance_reason</column> <column>incoming_migrations</column> <column>outgoing_migrations</column> + <column>updates_available</column> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e6</value> <value>3</value> @@ -3317,6 +3318,7 @@ <null /> <value>0</value> <value>0</value> + <null /> </row> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e7</value> @@ -3375,6 +3377,7 @@ <null /> <value>0</value> <value>0</value> + <value>true</value> </row> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e8</value> @@ -3433,6 +3436,7 @@ <null /> <value>0</value> <value>0</value> + <value>false</value> </row> <row> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> @@ -3491,6 +3495,7 @@ <null /> <value>0</value> <value>0</value> + <null /> </row> <row> <value>2001751e-549b-4e7a-aff6-32d36856c125</value> @@ -3549,6 +3554,7 @@ <null /> <value>0</value> <value>0</value> + <null /> </row> </table> diff --git a/packaging/dbscripts/upgrade/03_06_1220_add_updates_available_to_vds_dynamic.sql b/packaging/dbscripts/upgrade/03_06_1220_add_updates_available_to_vds_dynamic.sql new file mode 100644 index 0000000..8408eae --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_1220_add_updates_available_to_vds_dynamic.sql @@ -0,0 +1,2 @@ +select fn_db_add_column('vds_dynamic', 'is_update_available', 'BOOLEAN NOT NULL DEFAULT FALSE'); + -- To view, visit https://gerrit.ovirt.org/39862 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c788b17cb58791fe540b7130965a210557e68a5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
