Allon Mureinik has uploaded a new change for review. Change subject: core: Remove HasFreeVmsInPool ......................................................................
core: Remove HasFreeVmsInPool HasFreeVmsInPoolQuery is not used anywhere in the code, and hence should be removed. This patch removes the following: 1. The HasFreeVmsInPoolQuery class 2. The HasFreeVmsInPool constant representing it in VdcQueryType 3. The HasFreeVmsInPoolParameters class which was only used by the removed query class. 4. Moved several static methods from VmPoolCommandBase which were used by HasFreeVmsInPoolQuery and AttachUserToVmFromPoolAndRunCommand to AttachUserToVmFromPoolAndRunCommand, as it is now the only command that uses them - getVmToAttach(NGuid), getPrestartedVmToAttach(NGuid), getNonPrestartedVmToAttach(NGuid). These methods' visibility was also reduced to private, as they no longer need to be used outside this class. Change-Id: I3ed0bd42dc7c3c33bffcd97035c5c5e80bdc6df6 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HasFreeVmsInPoolQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/HasFreeVmsInPoolParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 5 files changed, 37 insertions(+), 67 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/13597/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java index 978b6a6..9c86cd5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java @@ -16,6 +16,8 @@ import org.ovirt.engine.core.common.action.VmPoolUserParameters; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VMStatus; +import org.ovirt.engine.core.common.businessentities.VmPoolMap; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.businessentities.permissions; import org.ovirt.engine.core.common.errors.VdcBLLException; @@ -79,6 +81,41 @@ return returnValue; } + private static Guid getVmToAttach(NGuid poolId) { + Guid vmGuid = Guid.Empty; + vmGuid = getPrestartedVmToAttach(poolId); + if (vmGuid == null || Guid.Empty.equals(vmGuid)) { + vmGuid = getNonPrestartedVmToAttach(poolId); + } + return vmGuid; + } + + private static Guid getPrestartedVmToAttach(NGuid vmPoolId) { + List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao() + .getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Up); + if (vmPoolMaps != null) { + for (VmPoolMap map : vmPoolMaps) { + if (canAttachPrestartedVmToUser(map.getvm_guid())) { + return map.getvm_guid(); + } + } + } + return Guid.Empty; + } + + private static Guid getNonPrestartedVmToAttach(NGuid vmPoolId) { + List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao() + .getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Down); + if (vmPoolMaps != null) { + for (VmPoolMap map : vmPoolMaps) { + if (canAttachNonPrestartedVmToUser(map.getvm_guid())) { + return map.getvm_guid(); + } + } + } + return Guid.Empty; + } + @Override public Guid getVmId() { return getParameters().getVmId(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HasFreeVmsInPoolQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HasFreeVmsInPoolQuery.java deleted file mode 100644 index 11b14d1..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HasFreeVmsInPoolQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.ovirt.engine.core.bll; - -import org.ovirt.engine.core.compat.*; -import org.ovirt.engine.core.common.queries.*; - -public class HasFreeVmsInPoolQuery<P extends HasFreeVmsInPoolParameters> extends QueriesCommandBase<P> { - public HasFreeVmsInPoolQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue((!VmPoolCommandBase.getVmToAttach(getParameters().getPoolId()) - .equals(Guid.Empty))); - } -} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java index 08b652f..694204b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmPoolCommandBase.java @@ -15,7 +15,6 @@ import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmPool; import org.ovirt.engine.core.common.businessentities.VmPoolMap; import org.ovirt.engine.core.common.businessentities.VmType; @@ -70,41 +69,6 @@ public VmPoolCommandBase(T parameters) { super(parameters); - } - - public static Guid getVmToAttach(NGuid poolId) { - Guid vmGuid = Guid.Empty; - vmGuid = getPrestartedVmToAttach(poolId); - if (vmGuid == null || Guid.Empty.equals(vmGuid)) { - vmGuid = getNonPrestartedVmToAttach(poolId); - } - return vmGuid; - } - - protected static Guid getNonPrestartedVmToAttach(NGuid vmPoolId) { - List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao() - .getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Down); - if (vmPoolMaps != null) { - for (VmPoolMap map : vmPoolMaps) { - if (canAttachNonPrestartedVmToUser(map.getvm_guid())) { - return map.getvm_guid(); - } - } - } - return Guid.Empty; - } - - protected static Guid getPrestartedVmToAttach(NGuid vmPoolId) { - List<VmPoolMap> vmPoolMaps = DbFacade.getInstance().getVmPoolDao() - .getVmMapsInVmPoolByVmPoolIdAndStatus(vmPoolId, VMStatus.Up); - if (vmPoolMaps != null) { - for (VmPoolMap map : vmPoolMaps) { - if (canAttachPrestartedVmToUser(map.getvm_guid())) { - return map.getvm_guid(); - } - } - } - return Guid.Empty; } protected static int getNumOfPrestartedVmsInPool(NGuid poolId) { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/HasFreeVmsInPoolParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/HasFreeVmsInPoolParameters.java deleted file mode 100644 index 49d0126..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/HasFreeVmsInPoolParameters.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.compat.*; - -public class HasFreeVmsInPoolParameters extends GetVmPoolByIdParametersBase { - private static final long serialVersionUID = 3927293237624681243L; - - public HasFreeVmsInPoolParameters(Guid poolId) { - super(poolId); - } - - public HasFreeVmsInPoolParameters() { - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index f53729e..874ceb8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -103,7 +103,6 @@ // VM pools queries GetVmPoolById(VdcQueryAuthType.User), - HasFreeVmsInPool, GetAllVmPoolsAttachedToUser(VdcQueryAuthType.User), GetAllVmsAndVmPools(VdcQueryAuthType.User), IsVmPoolWithSameNameExists, -- To view, visit http://gerrit.ovirt.org/13597 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3ed0bd42dc7c3c33bffcd97035c5c5e80bdc6df6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
