Alona Kaplan has uploaded a new change for review. Change subject: engine: add 'vds_maintenance_reason_required' column to vds_group ......................................................................
engine: add 'vds_maintenance_reason_required' column to vds_group This column will indicate whether the user will get a 'reason window' when moving the host to maintenance. The 'reason window' is a window with an option to set the reason for moving the host to maintenance. Bug-Url: https://bugzilla.redhat.com/678977 Change-Id: I9f3174acf5341a27e8c9d54a393bc93c75a54f7b Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml A packaging/dbscripts/upgrade/03_06_0950_vds_optional_reason.sql M packaging/dbscripts/vds_groups_sp.sql 5 files changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/38297/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java index f53c0b6..8d828c1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java @@ -79,6 +79,8 @@ private boolean optionalReasonRequired; + private boolean vdsMaintenanceReasonRequired; + private Guid clusterPolicyId; private String clusterPolicyName; @@ -286,6 +288,14 @@ this.optionalReasonRequired = optionalReasonRequired; } + public boolean isVdsMaintenanceReasonRequired() { + return vdsMaintenanceReasonRequired; + } + + public void setVdsMaintenanceReasonRequired(boolean vdsMaintenanceReasonRequired) { + this.vdsMaintenanceReasonRequired = vdsMaintenanceReasonRequired; + } + public Guid getClusterPolicyId() { return clusterPolicyId; } @@ -448,6 +458,7 @@ result = prime * result + (fencingPolicy == null ? 0 : fencingPolicy.hashCode()); result = prime * result + (autoConverge == null ? 0 : autoConverge.hashCode()); result = prime * result + (migrateCompressed == null ? 0 : migrateCompressed.hashCode()); + result = prime * result + (vdsMaintenanceReasonRequired ? 1231 : 1237); return result; } @@ -493,7 +504,8 @@ && ObjectUtils.objectsEqual(requiredRngSources, other.requiredRngSources) && ObjectUtils.objectsEqual(fencingPolicy, other.fencingPolicy) && ObjectUtils.objectsEqual(autoConverge, other.autoConverge) - && ObjectUtils.objectsEqual(migrateCompressed, other.migrateCompressed); + && ObjectUtils.objectsEqual(migrateCompressed, other.migrateCompressed) + && ObjectUtils.objectsEqual(vdsMaintenanceReasonRequired, other.vdsMaintenanceReasonRequired); } } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java index ebabdc5..a507486 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java @@ -213,6 +213,7 @@ .addValue("trusted_service", group.supportsTrustedService()) .addValue("ha_reservation", group.supportsHaReservation()) .addValue("optional_reason", group.isOptionalReasonRequired()) + .addValue("vds_maintenance_reason_required", group.isVdsMaintenanceReasonRequired()) .addValue("cluster_policy_id", group.getClusterPolicyId()) .addValue("cluster_policy_custom_properties", SerializationFactory.getSerializer().serialize(group.getClusterPolicyProperties())) @@ -278,6 +279,7 @@ entity.setTrustedService(rs.getBoolean("trusted_service")); entity.setHaReservation(rs.getBoolean("ha_reservation")); entity.setOptionalReasonRequired(rs.getBoolean("optional_reason")); + entity.setVdsMaintenanceReasonRequired(rs.getBoolean("vds_maintenance_reason_required")); entity.setClusterPolicyId(Guid.createGuidFromString(rs.getString("cluster_policy_id"))); entity.setClusterPolicyName(rs.getString("cluster_policy_name")); entity.setClusterPolicyProperties(SerializationFactory.getDeserializer() diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 4db39e6..cabcb20 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -794,6 +794,7 @@ <column>fencing_enabled</column> <column>is_auto_converge</column> <column>is_migrate_compressed</column> + <column>vds_maintenance_reason_required</column> <row> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d1</value> <value>rhel6.iscsi</value> @@ -825,6 +826,7 @@ <value>true</value> <value>true</value> <value>true</value> + <value>false</value> </row> <row> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d2</value> @@ -856,6 +858,7 @@ <value>50</value> <value>true</value> <value>true</value> + <value>false</value> <value>false</value> </row> <row> @@ -889,6 +892,7 @@ <value>true</value> <value>false</value> <value>true</value> + <value>false</value> </row> <row> <value>0e57070e-2469-4b38-84a2-f111aaabd49d</value> @@ -921,6 +925,7 @@ <value>true</value> <null /> <value>true</value> + <value>false</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7c</value> @@ -953,6 +958,7 @@ <value>true</value> <value>true</value> <null /> + <value>false</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7d</value> @@ -984,6 +990,7 @@ <value>50</value> <value>false</value> <null /> + <value>false</value> <value>false</value> </row> <row> @@ -1017,6 +1024,7 @@ <value>true</value> <value>false</value> <null /> + <value>false</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7f</value> @@ -1049,6 +1057,7 @@ <value>true</value> <null /> <null /> + <value>false</value> </row> <row> <value>ae956031-6be2-43d6-bb8f-5191c9253314</value> @@ -1081,6 +1090,7 @@ <value>false</value> <null /> <null /> + <value>true</value> </row> </table> diff --git a/packaging/dbscripts/upgrade/03_06_0950_vds_optional_reason.sql b/packaging/dbscripts/upgrade/03_06_0950_vds_optional_reason.sql new file mode 100644 index 0000000..8613929 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_0950_vds_optional_reason.sql @@ -0,0 +1 @@ +select fn_db_add_column('vds_groups', 'vds_maintenance_reason_required', 'boolean not null default false'); diff --git a/packaging/dbscripts/vds_groups_sp.sql b/packaging/dbscripts/vds_groups_sp.sql index bdff415..356b660 100644 --- a/packaging/dbscripts/vds_groups_sp.sql +++ b/packaging/dbscripts/vds_groups_sp.sql @@ -27,6 +27,7 @@ v_trusted_service BOOLEAN, v_ha_reservation BOOLEAN, v_optional_reason BOOLEAN, + v_vds_maintenance_reason_required BOOLEAN, v_cluster_policy_id UUID, v_cluster_policy_custom_properties text, v_enable_balloon BOOLEAN, @@ -48,11 +49,11 @@ AS $procedure$ BEGIN INSERT INTO vds_groups(vds_group_id,description, name, free_text_comment, cpu_name, storage_pool_id, max_vds_memory_over_commit, count_threads_as_cores, compatibility_version, - transparent_hugepages, migrate_on_error, virt_service, gluster_service, tunnel_migration, emulated_machine, detect_emulated_machine, trusted_service, ha_reservation, optional_reason, cluster_policy_id, + transparent_hugepages, migrate_on_error, virt_service, gluster_service, tunnel_migration, emulated_machine, detect_emulated_machine, trusted_service, ha_reservation, optional_reason, vds_maintenance_reason_required, cluster_policy_id, cluster_policy_custom_properties, enable_balloon, architecture, optimization_type, spice_proxy, enable_ksm, serial_number_policy, custom_serial_number, required_rng_sources, skip_fencing_if_sd_active, skip_fencing_if_connectivity_broken, hosts_with_broken_connectivity_threshold, fencing_enabled, is_auto_converge, is_migrate_compressed) VALUES(v_vds_group_id,v_description, v_name, v_free_text_comment, v_cpu_name, v_storage_pool_id, v_max_vds_memory_over_commit, v_count_threads_as_cores, v_compatibility_version, - v_transparent_hugepages, v_migrate_on_error, v_virt_service, v_gluster_service, v_tunnel_migration, v_emulated_machine, v_detect_emulated_machine, v_trusted_service, v_ha_reservation, v_optional_reason, v_cluster_policy_id, v_cluster_policy_custom_properties, v_enable_balloon, + v_transparent_hugepages, v_migrate_on_error, v_virt_service, v_gluster_service, v_tunnel_migration, v_emulated_machine, v_detect_emulated_machine, v_trusted_service, v_ha_reservation, v_optional_reason, v_vds_maintenance_reason_required, v_cluster_policy_id, v_cluster_policy_custom_properties, v_enable_balloon, v_architecture, v_optimization_type, v_spice_proxy, v_enable_ksm, v_serial_number_policy, v_custom_serial_number, v_required_rng_sources, v_skip_fencing_if_sd_active, v_skip_fencing_if_connectivity_broken, v_hosts_with_broken_connectivity_threshold, v_fencing_enabled, v_is_auto_converge, v_is_migrate_compressed); END; $procedure$ @@ -81,6 +82,7 @@ v_trusted_service BOOLEAN, v_ha_reservation BOOLEAN, v_optional_reason BOOLEAN, + v_vds_maintenance_reason_required BOOLEAN, v_cluster_policy_id UUID, v_cluster_policy_custom_properties text, v_enable_balloon BOOLEAN, @@ -111,7 +113,7 @@ compatibility_version = v_compatibility_version,transparent_hugepages = v_transparent_hugepages, migrate_on_error = v_migrate_on_error, virt_service = v_virt_service, gluster_service = v_gluster_service, tunnel_migration = v_tunnel_migration, - emulated_machine = v_emulated_machine, detect_emulated_machine = v_detect_emulated_machine, trusted_service = v_trusted_service, ha_reservation = v_ha_reservation , optional_reason = v_optional_reason, cluster_policy_id = v_cluster_policy_id, + emulated_machine = v_emulated_machine, detect_emulated_machine = v_detect_emulated_machine, trusted_service = v_trusted_service, ha_reservation = v_ha_reservation , optional_reason = v_optional_reason, vds_maintenance_reason_required = v_vds_maintenance_reason_required, cluster_policy_id = v_cluster_policy_id, cluster_policy_custom_properties = v_cluster_policy_custom_properties, enable_balloon = v_enable_balloon, architecture = v_architecture, optimization_type = v_optimization_type, spice_proxy = v_spice_proxy, enable_ksm = v_enable_ksm, serial_number_policy = v_serial_number_policy, custom_serial_number = v_custom_serial_number, -- To view, visit https://gerrit.ovirt.org/38297 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f3174acf5341a27e8c9d54a393bc93c75a54f7b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
