Shmuel Leib Melamud has uploaded a new change for review.
Change subject: engine: Removed AddVmPoolCommand class
......................................................................
engine: Removed AddVmPoolCommand class
Removed AddVmPoolCommand class, because it is no longer used:
1. VdcActionType.AddVmPool is never used.
2. CommonVmPoolWithVmsCommand extends AddVmPoolCommand, but this
inheritance is useless:
a. AddVmPoolCommand.executeCommand() is never called from
CommonVmPoolWithVmsCommand.executeCommand(), the same work is done
by AddVmPoolWithVmsCommand.getPoolId().
b. AddVmPoolCommand.getAuditLogTypeValue() is never called.
c. AddVmPoolCommand.getValidationGroups() does the same as
AddVmPoolWithVmsCommand.getValidationGroups() and was merged to
UpdateVmPoolWithVmsCommand.getValidationGroups().
d. AddVmPoolCommand() constructor code is merged to
CommonVmPoolWithVmsCommand() constructor.
3. The hierarchy where UpdateVmPoolWithVmsCommand is inherited
indirectly from AddVmPoolCommand seems illogical.
Change-Id: I6941ff975c7051d14a077dc7126b59b5e0fea114
Signed-off-by: Shmuel Melamud <[email protected]>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
6 files changed, 4 insertions(+), 53 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/39337/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolCommand.java
deleted file mode 100644
index caf9d66..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmPoolCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.List;
-
-import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.VmPoolOperationParameters;
-import org.ovirt.engine.core.common.businessentities.VmPool;
-import org.ovirt.engine.core.common.validation.group.CreateEntity;
-import org.ovirt.engine.core.compat.Guid;
-
-public class AddVmPoolCommand<T extends VmPoolOperationParameters> extends
VmPoolCommandBase<T> {
-
- /**
- * Constructor for command creation when compensation is applied on startup
- */
- protected AddVmPoolCommand(Guid commandId) {
- super(commandId);
- }
-
- public AddVmPoolCommand(T parameters) {
- super(parameters);
- setVmPool(parameters.getVmPool());
- }
-
- @Override
- protected void executeCommand() {
- VmPool vmPool = getVmPool();
-
- getVmPoolDAO().save(vmPool);
- setActionReturnValue(vmPool.getVmPoolId());
- setSucceeded(true);
- }
-
- @Override
- public AuditLogType getAuditLogTypeValue() {
- return getSucceeded() ? AuditLogType.USER_ADD_VM_POOL
- : AuditLogType.USER_ADD_VM_POOL_FAILED;
- }
-
- @Override
- protected List<Class<?>> getValidationGroups() {
- addValidationGroup(CreateEntity.class);
- return super.getValidationGroups();
- }
-
-
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
index 50a254f..8ecc16e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolWithVmsCommand.java
@@ -56,7 +56,7 @@
* already exists - the number is increased. For example if vm_8 exists - vm_9
will be created instead of it.
*/
-public abstract class CommonVmPoolWithVmsCommand<T extends
AddVmPoolWithVmsParameters> extends AddVmPoolCommand<T>
+public abstract class CommonVmPoolWithVmsCommand<T extends
AddVmPoolWithVmsParameters> extends VmPoolCommandBase<T>
implements QuotaStorageDependent {
private HashMap<Guid, DiskImage> diskInfoDestinationMap;
@@ -76,6 +76,7 @@
public CommonVmPoolWithVmsCommand(T parameters) {
super(parameters);
+ setVmPool(parameters.getVmPool());
setVdsGroupId(parameters.getVmPool().getVdsGroupId());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
index 2732efb..cc1c8d4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmPoolWithVmsCommand.java
@@ -6,6 +6,7 @@
import org.ovirt.engine.core.common.action.AddVmPoolWithVmsParameters;
import org.ovirt.engine.core.common.businessentities.VmPool;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
+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.dal.dbbroker.auditloghandling.AuditLogableBase;
@@ -90,6 +91,7 @@
@Override
protected List<Class<?>> getValidationGroups() {
+ addValidationGroup(CreateEntity.class);
addValidationGroup(UpdateEntity.class);
return super.getValidationGroups();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index d4856be..8cebcca 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -575,8 +575,6 @@
AuditLogTimeInterval.MINUTE.getValue() * 15),
VM_MEMORY_NOT_IN_RECOMMENDED_RANGE(178, AuditLogSeverity.WARNING),
- USER_ADD_VM_POOL(300),
- USER_ADD_VM_POOL_FAILED(301, AuditLogSeverity.ERROR),
USER_ADD_VM_POOL_WITH_VMS(302),
USER_ADD_VM_POOL_WITH_VMS_FAILED(303, AuditLogSeverity.ERROR),
USER_ADD_VM_POOL_WITH_VMS_ADD_VDS_FAILED(320, AuditLogSeverity.ERROR),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index c73ebbe..44c719d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -159,7 +159,6 @@
MergeStatus(238, QuotaDependency.NONE),
DestroyImage(239, QuotaDependency.STORAGE),
// VmPoolCommands
- AddVmPool(301, QuotaDependency.NONE),
AddVmPoolWithVms(304, ActionGroup.CREATE_VM_POOL, QuotaDependency.BOTH),
UpdateVmPoolWithVms(305, ActionGroup.EDIT_VM_POOL_CONFIGURATION,
QuotaDependency.STORAGE),
AddVmAndAttachToPool(306, QuotaDependency.NONE),
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
index 7613765..e8bd5b9 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -14,8 +14,6 @@
USER_ADD_VM_STARTED=VM ${VmName} creation was initiated by ${UserName}.
USER_ADD_VM_FINISHED_SUCCESS=VM ${VmName} creation has been completed.
USER_ADD_VM_FINISHED_FAILURE=Failed to complete VM ${VmName} creation.
-USER_ADD_VM_POOL=VM Pool ${VmPoolName} was created by ${UserName}.
-USER_ADD_VM_POOL_FAILED=Failed to create VM Pool ${VmPoolName} (User:
${UserName}).
USER_ADD_VM_POOL_WITH_VMS=VM Pool ${VmPoolName} (containing ${VmsCount} VMs)
was created by ${UserName}.
USER_ADD_VM_POOL_WITH_VMS_FAILED=Failed to create VM Pool ${VmPoolName} (User:
${UserName}).
USER_ADD_VM_POOL_WITH_VMS_ADD_VDS_FAILED=Pool ${VmPoolName} Created, but some
Vms failed to create (User: ${UserName}).
--
To view, visit https://gerrit.ovirt.org/39337
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6941ff975c7051d14a077dc7126b59b5e0fea114
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
