Kanagaraj M has uploaded a new change for review. Change subject: engine: include VdsGroup virt, gluster flags in VDS entity ......................................................................
engine: include VdsGroup virt, gluster flags in VDS entity Added virt_service and gluster_service flags to VDS entity. VDS view is modified accordingly to read these flags from vds_groups table. Change-Id: I961a37312425213fdbce446001fd2874f7661cd1 Signed-off-by: Kanagaraj M <[email protected]> --- M backend/manager/dbscripts/create_views.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/15636/1 diff --git a/backend/manager/dbscripts/create_views.sql b/backend/manager/dbscripts/create_views.sql index 5166a54..ddb5afb 100644 --- a/backend/manager/dbscripts/create_views.sql +++ b/backend/manager/dbscripts/create_views.sql @@ -650,6 +650,7 @@ vds_statistics.swap_total as swap_total, vds_statistics.ksm_cpu_percent as ksm_cpu_percent, vds_statistics.ksm_pages as ksm_pages, vds_statistics.ksm_state as ksm_state, vds_dynamic.cpu_flags as cpu_flags,vds_groups.cpu_name as vds_group_cpu_name, vds_dynamic.cpu_sockets as cpu_sockets, vds_spm_id_map.vds_spm_id as vds_spm_id, vds_static.otp_validity as otp_validity, CASE WHEN storage_pool.spm_vds_id = vds_static.vds_id THEN CASE WHEN storage_pool.status = 5 THEN 1 ELSE 2 END ELSE 0 END as spm_status, vds_dynamic.supported_cluster_levels as supported_cluster_levels, vds_dynamic.supported_engines as supported_engines, vds_groups.compatibility_version as vds_group_compatibility_version, + vds_groups.virt_service as vds_group_virt_service, vds_groups.gluster_service as vds_group_gluster_service, vds_dynamic.host_os as host_os, vds_dynamic.kvm_version as kvm_version, vds_dynamic.libvirt_version as libvirt_version, vds_dynamic.spice_version as spice_version, vds_dynamic.kernel_version as kernel_version, vds_dynamic.iscsi_initiator_name as iscsi_initiator_name, vds_dynamic.transparent_hugepages_state as transparent_hugepages_state, vds_dynamic.anonymous_hugepages as anonymous_hugepages, vds_dynamic.non_operational_reason as non_operational_reason, vds_static.recoverable as recoverable, vds_static.sshKeyFingerprint as sshKeyFingerprint, vds_dynamic.hw_manufacturer as hw_manufacturer, vds_dynamic.hw_product_name as hw_product_name, vds_dynamic.hw_version as hw_version, 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 92787de..ee3c08b 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 @@ -329,6 +329,26 @@ this.vdsGroupCpuName = value; } + private boolean vdsGroupVirtSerice; + + public boolean getVdsGroupSupportsVirtSerice() { + return this.vdsGroupVirtSerice; + } + + public void setVdsGroupSupportsVirtSerice(boolean value) { + this.vdsGroupVirtSerice = value; + } + + private boolean vdsGroupGlusterSerice; + + public boolean getVdsGroupSupportsGlusterSerice() { + return this.vdsGroupGlusterSerice; + } + + public void setVdsGroupSupportsGlusterSerice(boolean value) { + this.vdsGroupGlusterSerice = value; + } + @Override public Guid getId() { return this.mVdsStatic.getId(); 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 adb77dd..9629dfd 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 @@ -316,6 +316,8 @@ entity.setSupportedEngines(rs.getString("supported_engines")); entity.setVdsGroupCompatibilityVersion(new Version(rs .getString("vds_group_compatibility_version"))); + entity.setVdsGroupSupportsVirtSerice(rs.getBoolean("vds_group_virt_service")); + entity.setVdsGroupSupportsGlusterSerice(rs.getBoolean("vds_group_gluster_service")); entity.setHostOs(rs.getString("host_os")); entity.setKvmVersion(rs.getString("kvm_version")); entity.setLibvirtVersion(new RpmVersion(rs.getString("libvirt_version"))); -- To view, visit http://gerrit.ovirt.org/15636 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I961a37312425213fdbce446001fd2874f7661cd1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
