Shahar Havivi has uploaded a new change for review. Change subject: Engine: remove timelease from pool type ......................................................................
Engine: remove timelease from pool type It's not supported for a long time. Change-Id: I4485501d4cd4a73d889ebb656751d674f55eae87 https://bugzilla.redhat.com/858958 Signed-off-by: Shahar Havivi <shav...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java M packaging/dbscripts/user_sp.sql 7 files changed, 3 insertions(+), 98 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/20242/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java index 4f9b2f4..e3b6278 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java @@ -13,7 +13,6 @@ import org.ovirt.engine.core.common.validation.group.CreateEntity; import org.ovirt.engine.core.common.validation.group.UpdateEntity; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.TimeSpan; public class VmPool extends IVdcQueryable implements Serializable, Nameable, Commented { @@ -114,50 +113,12 @@ && maxAssignedVmsPerUser == other.maxAssignedVmsPerUser); } - private void initializeTimeLeasedDefaultData(String parameter) { - String[] values = parameter.split("[,]", -1); - if (values.length == 3) { - try { - defaultTimeInDays = Integer.parseInt(values[0]); - String[] startTime = values[1].split("[:]", -1); - if (startTime.length > 1) { - - defaultStartTime = new TimeSpan(Integer.parseInt(startTime[0]), Integer.parseInt(startTime[1]), 0); - } - String[] endTime = values[2].split("[:]", -1); - if (endTime.length > 1) { - defaultEndTime = new TimeSpan(Integer.parseInt(endTime[0]), Integer.parseInt(endTime[1]), 0); - } - } catch (java.lang.Exception e) { - } - } - } - public String getParameters() { - switch (getVmPoolType()) { - case TimeLease: { - return StringFormat.format("%1$s,%2$s:%3$s,%4$s:%5$s", defaultTimeInDays, defaultStartTime.Hours, - defaultStartTime.Minutes, defaultEndTime.Hours, defaultEndTime.Minutes); - } - default: { - return parameters; - } - } - + return parameters; } public void setParameters(String value) { - switch (getVmPoolType()) { - case TimeLease: { - initializeTimeLeasedDefaultData(value); - break; - } - default: { - parameters = value; - break; - } - } - + parameters = value; } public int getDefaultTimeInDays() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolType.java index 320158a..7644c55 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPoolType.java @@ -3,8 +3,7 @@ public enum VmPoolType implements Identifiable { // FIXME add ids and remove the ordinal impl of getValue Automatic, - Manual, - TimeLease; + Manual; @Override public int getValue() { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java index 67c2b63..b73a058 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAO.java @@ -183,7 +183,5 @@ List<TagsVmMap> getTagVmMapByVmIdAndDefaultTag(Guid vmid); - List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId, Guid vmPoolId); - List<TagsVmPoolMap> getVmPoolTagsByVmPoolIdAndAdElementId(Guid vmPoolId, Guid adElementId); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java index dafa2a4..9e5563f 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/TagDAODbFacadeImpl.java @@ -401,28 +401,6 @@ @SuppressWarnings("unchecked") @Override - public List<TagsVmMap> getTimeLeasedUserVmsByAdGroupAndVmPoolId(Guid adGroupId, Guid vmPoolId) { - MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("groupId", adGroupId) - .addValue("vm_pool_id", vmPoolId); - - RowMapper<TagsVmMap> mapper = new RowMapper<TagsVmMap>() { - @Override - public TagsVmMap mapRow(ResultSet rs, int rowNum) throws SQLException { - TagsVmMap entity = new TagsVmMap(); - entity.settag_id(getGuidDefaultEmpty(rs, "tag_id")); - entity.setvm_id(getGuidDefaultEmpty(rs, "vm_id")); - entity.setDefaultDisplayType((Integer) rs.getObject("DefaultDisplayType")); - return entity; - } - }; - - return getCallsHandler() - .executeReadList( - "GetTimeLeasedUsersVmsByGroupIdAndPoolId", mapper, parameterSource); - } - - @SuppressWarnings("unchecked") - @Override public List<TagsVmPoolMap> getVmPoolTagsByVmPoolIdAndAdElementId(Guid vmPoolId, Guid adElementId) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource().addValue("ad_id", adElementId) .addValue("vm_pool_id", vmPoolId); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java index edc860f..8e4b89b 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java @@ -238,8 +238,6 @@ String VmPoolType___Manual(); - String VmPoolType___TimeLease(); - String AdRefStatus___Inactive(); String AdRefStatus___Active(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java index 88aa146..a759725 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java @@ -408,13 +408,9 @@ String VdcActionType___AttachActionToRole(); - String VdcActionType___AttachAdGroupTimeLeasedPool(); - String VdcActionType___AttachNetworkToVdsGroup(); String VdcActionType___AttachNetworkToVdsInterface(); - - String VdcActionType___AttachUserToTimeLeasedPool(); String VdcActionType___AttachVmPoolToAdGroup(); @@ -432,13 +428,9 @@ String VdcActionType___DetachActionFromRole(); - String VdcActionType___DetachAdGroupFromTimeLeasedPool(); - String VdcActionType___DetachNetworkFromVdsInterface(); String VdcActionType___DetachNetworkToVdsGroup(); - - String VdcActionType___DetachUserFromTimeLeasedPool(); String VdcActionType___DetachUserFromVmFromPool(); @@ -508,15 +500,11 @@ String VdcActionType___TryBackToAllSnapshotsOfVm(); - String VdcActionType___UpdateAdGroupTimeLeasedPool(); - String VdcActionType___UpdateNetworkToVdsInterface(); String VdcActionType___UpdateNetwork(); String VdcActionType___UpdateRole(); - - String VdcActionType___UpdateUserToTimeLeasedPool(); String VdcActionType___UpdateVds(); diff --git a/packaging/dbscripts/user_sp.sql b/packaging/dbscripts/user_sp.sql index 3e0e3c8..7d8a619 100644 --- a/packaging/dbscripts/user_sp.sql +++ b/packaging/dbscripts/user_sp.sql @@ -4,23 +4,6 @@ -Create or replace FUNCTION GetTimeLeasedUsersVmsByGroupIdAndPoolId(v_groupId UUID, - v_vm_pool_id UUID) RETURNS SETOF tags_vm_map STABLE - AS $procedure$ -BEGIN - RETURN QUERY select tags_vm_map.* from tags_vm_map - inner join vm_pool_map on vm_pool_map.vm_guid = tags_vm_map.vm_id - inner join tags_permissions_map on tags_permissions_map.tag_id = tags_vm_map.tag_id - inner join permissions on permissions.id = tags_permissions_map.permission_id - where permissions.ad_element_id - in(select users.user_id from users - where (users.groups LIKE '%' ||(select ad_groups.name from ad_groups where ad_groups.id = v_groupId) - || '%')) - and - vm_pool_map.vm_pool_id = v_vm_pool_id; -END; $procedure$ -LANGUAGE plpgsql; - ---------------------------------------------------------------- -- [users] Table -- -- To view, visit http://gerrit.ovirt.org/20242 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4485501d4cd4a73d889ebb656751d674f55eae87 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
