Maor Lipchuk has uploaded a new change for review.
Change subject: core: Remove auto suspend audit log.
......................................................................
core: Remove auto suspend audit log.
1. Remove audit log of auto suspend
2. Removing hibernateVM parameter class after auto suspend has been
removed.
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
Change-Id: I7d9eb34264ab64c54bc12225cc0820b30c40667a
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
D
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HibernateVmParameters.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
11 files changed, 15 insertions(+), 65 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/16275/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
index 87d73e8..f9706ab 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java
@@ -6,9 +6,8 @@
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
-import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskType;
import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
@@ -16,8 +15,8 @@
import org.ovirt.engine.core.common.businessentities.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.VolumeType;
import org.ovirt.engine.core.common.errors.VdcBLLException;
-import org.ovirt.engine.core.common.locks.LockingGroup;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
+import org.ovirt.engine.core.common.locks.LockingGroup;
import org.ovirt.engine.core.common.utils.Pair;
import
org.ovirt.engine.core.common.vdscommands.CreateImageVDSCommandParameters;
import org.ovirt.engine.core.common.vdscommands.HibernateVDSCommandParameters;
@@ -34,7 +33,7 @@
@LockIdNameAttribute
@DisableInPrepareMode
@NonTransactiveCommandAttribute(forceCompensation = true)
-public class HibernateVmCommand<T extends HibernateVmParameters> extends
VmOperationCommandBase<T> {
+public class HibernateVmCommand<T extends VmOperationParameterBase> extends
VmOperationCommandBase<T> {
private boolean isHibernateVdsProblematic = false;
/** The size for the snapshot's meta data which is vm related properties
at the
@@ -198,11 +197,6 @@
return AsyncTaskType.createVolume;
}
- protected HibernateVmParameters getHibernateVmParams() {
- VdcActionParametersBase tempVar = getParameters();
- return (HibernateVmParameters) ((tempVar instanceof
HibernateVmParameters) ? tempVar : null);
- }
-
/**
* Note: the treatment for {@link CommandActionState#END_SUCCESS} is the
same as for {@link CommandActionState#END_FAILURE}
* because if after calling {@link HibernateVmCommand#endSuccessfully()}
the method {@link HibernateVmCommand#getSucceeded()}
@@ -214,15 +208,12 @@
public AuditLogType getAuditLogTypeValue() {
switch (getActionState()) {
case EXECUTE:
- return getHibernateVmParams().getAutomaticSuspend() ?
- getSucceeded() ? AuditLogType.AUTO_SUSPEND_VM :
AuditLogType.AUTO_FAILED_SUSPEND_VM
- : getSucceeded() ? AuditLogType.USER_SUSPEND_VM :
AuditLogType.USER_FAILED_SUSPEND_VM;
-
+ return getSucceeded() ? AuditLogType.USER_SUSPEND_VM :
AuditLogType.USER_FAILED_SUSPEND_VM;
case END_SUCCESS:
case END_FAILURE:
default:
- return getHibernateVmParams().getAutomaticSuspend() ?
AuditLogType.AUTO_SUSPEND_VM_FINISH_FAILURE
- : isHibernateVdsProblematic ?
AuditLogType.USER_SUSPEND_VM_FINISH_FAILURE_WILL_TRY_AGAIN :
AuditLogType.USER_SUSPEND_VM_FINISH_FAILURE;
+ return isHibernateVdsProblematic ?
AuditLogType.USER_SUSPEND_VM_FINISH_FAILURE_WILL_TRY_AGAIN
+ : AuditLogType.USER_SUSPEND_VM_FINISH_FAILURE;
}
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
index d850df0..1031147 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/BackwardCompatibilityTaskCreationTest.java
@@ -21,7 +21,6 @@
import org.ovirt.engine.core.common.action.AddImageFromScratchParameters;
import org.ovirt.engine.core.common.action.CreateCloneOfTemplateParameters;
import org.ovirt.engine.core.common.action.CreateImageTemplateParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.ImagesActionsParametersBase;
import org.ovirt.engine.core.common.action.ImagesContainterParametersBase;
import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters;
@@ -31,6 +30,7 @@
import org.ovirt.engine.core.common.action.RestoreFromSnapshotParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskCreationInfo;
import org.ovirt.engine.core.common.asynctasks.AsyncTaskType;
import org.ovirt.engine.core.common.businessentities.AsyncTaskResultEnum;
@@ -88,7 +88,7 @@
new CreateImageTemplateCommand(new
CreateImageTemplateParameters()),
new CreateCloneOfTemplateCommand(new
CreateCloneOfTemplateParameters()),
new RemoveVmCommand(new RemoveVmParameters()),
- new HibernateVmCommand(new HibernateVmParameters()) {
+ new HibernateVmCommand(new VmOperationParameterBase()) {
@Override
public VM getVm() {
VM vm = new VM();
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 58ff6c4..4c28026 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
@@ -332,12 +332,6 @@
USER_CLEAR_UNKNOWN_VMS(348),
USER_FAILED_CLEAR_UNKNOWN_VMS(349),
- AUTO_SUSPEND_VM(524),
- @Deprecated
- AUTO_SUSPEND_VM_FINISH_SUCCESS(525),
- AUTO_SUSPEND_VM_FINISH_FAILURE(526),
- AUTO_FAILED_SUSPEND_VM(527),
-
USER_EJECT_VM_DISK(528),
USER_EJECT_VM_FLOPPY(529),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HibernateVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HibernateVmParameters.java
deleted file mode 100644
index 80d9887..0000000
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HibernateVmParameters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.ovirt.engine.core.common.action;
-
-import org.ovirt.engine.core.compat.Guid;
-
-public class HibernateVmParameters extends VmOperationParameterBase implements
java.io.Serializable {
- private static final long serialVersionUID = 4526154915680207381L;
- private boolean privateAutomaticSuspend;
-
- public boolean getAutomaticSuspend() {
- return privateAutomaticSuspend;
- }
-
- public void setAutomaticSuspend(boolean value) {
- privateAutomaticSuspend = value;
- }
-
- public HibernateVmParameters(Guid vmId) {
- super(vmId);
- }
-
- public HibernateVmParameters() {
- }
-}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
index c6a5ffa..81289af 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
@@ -471,10 +471,6 @@
severities.put(AuditLogType.USER_DETACH_VM_POOL_TO_AD_GROUP_FAILED,
AuditLogSeverity.ERROR);
severities.put(AuditLogType.USER_REMOVE_AD_GROUP,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.USER_REMOVE_AD_GROUP_FAILED,
AuditLogSeverity.ERROR);
- severities.put(AuditLogType.AUTO_SUSPEND_VM, AuditLogSeverity.NORMAL);
- severities.put(AuditLogType.AUTO_SUSPEND_VM_FINISH_SUCCESS,
AuditLogSeverity.NORMAL);
- severities.put(AuditLogType.AUTO_SUSPEND_VM_FINISH_FAILURE,
AuditLogSeverity.ERROR);
- severities.put(AuditLogType.AUTO_FAILED_SUSPEND_VM,
AuditLogSeverity.ERROR);
severities.put(AuditLogType.VM_MIGRATION_START,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.VM_CANCEL_MIGRATION,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.VM_CANCEL_MIGRATION_FAILED,
AuditLogSeverity.ERROR);
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 982a8ef..483a6ec 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -284,10 +284,6 @@
USER_SUSPEND_VM_FINISH_FAILURE=Failed to complete suspending of VM ${VmName}.
USER_SUSPEND_VM_FINISH_FAILURE_WILL_TRY_AGAIN=Failed to complete suspending of
VM ${VmName}, will try again.
USER_FAILED_SUSPEND_VM=Failed to suspend VM ${VmName} (Host: ${VdsName}).
-AUTO_SUSPEND_VM=Automatically Suspending VM ${VmName} was initiated (Host:
${VdsName}).
-AUTO_SUSPEND_VM_FINISH_SUCCESS=Automatically Suspending VM ${VmName} has
completed.
-AUTO_SUSPEND_VM_FINISH_FAILURE=Failed to complete automatically suspending of
VM ${VmName}.
-AUTO_FAILED_SUSPEND_VM=Failed to automatically suspend VM ${VmName} (Host:
${VdsName}).
USER_VDS_MAINTENANCE=Host ${VdsName} was switched to Maintenance mode by
${UserName}.
USER_VDS_MAINTENANCE_MIGRATION_FAILED=Host ${VdsName} cannot change into
maintenance mode - not all Vms have been migrated successfully. Consider manual
intervention: stopping/migrating Vms: ${failedVms} (User: ${UserName}).
USER_EXPORT_VM=VM ${VmName} exported to ${ExportPath} by ${UserName}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
index 673b52e..4cc1803 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
@@ -38,7 +38,6 @@
import org.ovirt.engine.api.restapi.types.VmMapper;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.ChangeVMClusterParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmToServerParameters;
import org.ovirt.engine.core.common.action.MoveVmParameters;
@@ -257,7 +256,7 @@
@Override
public Response suspend(Action action) {
return doAction(VdcActionType.HibernateVm,
- new HibernateVmParameters(guid),
+ new VmOperationParameterBase(guid),
action);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
index c32c5fb..b83dd4b 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
@@ -38,7 +38,6 @@
import org.ovirt.engine.api.model.VmPlacementPolicy;
import org.ovirt.engine.api.restapi.utils.OsTypeMockUtils;
import org.ovirt.engine.core.common.action.ChangeVMClusterParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmToServerParameters;
import org.ovirt.engine.core.common.action.MoveVmParameters;
@@ -467,7 +466,7 @@
@Test
public void testSuspend() throws Exception {
setUriInfo(setUpActionExpectations(VdcActionType.HibernateVm,
- HibernateVmParameters.class,
+ VmOperationParameterBase.class,
new String[] { "VmId" },
new Object[] { GUIDS[0] }));
@@ -491,7 +490,7 @@
private void doTestSuspendAsync(AsyncTaskStatusEnum asyncStatus,
CreationStatus actionStatus) throws Exception {
setUriInfo(setUpActionExpectations(VdcActionType.HibernateVm,
- HibernateVmParameters.class,
+ VmOperationParameterBase.class,
new String[] { "VmId" },
new Object[] { GUIDS[0] },
asList(GUIDS[1]),
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java
index ca56566..fb24b26 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/VmItemBehavior.java
@@ -4,12 +4,12 @@
import org.ovirt.engine.core.common.VdcActionUtils;
import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.RunVmParams;
import org.ovirt.engine.core.common.action.ShutdownVmParameters;
import org.ovirt.engine.core.common.action.StopVmParameters;
import org.ovirt.engine.core.common.action.StopVmTypeEnum;
import org.ovirt.engine.core.common.action.VdcActionType;
+import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmPool;
import org.ovirt.engine.core.common.businessentities.VmPoolType;
@@ -129,7 +129,7 @@
private void pause()
{
VM entity = (VM) getItem().getEntity();
- Frontend.RunAction(VdcActionType.HibernateVm, new
HibernateVmParameters(entity.getId()));
+ Frontend.RunAction(VdcActionType.HibernateVm, new
VmOperationParameterBase(entity.getId()));
}
private void run()
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
index a9716df..4af8c9d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
@@ -6,7 +6,6 @@
import java.util.List;
import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.RunVmParams;
import org.ovirt.engine.core.common.action.SetVmTicketParameters;
import org.ovirt.engine.core.common.action.ShutdownVmParameters;
@@ -213,7 +212,7 @@
} else if (StringHelper.stringsEqual(item.getCommandName(),
CommandSuspend)) {
Frontend.RunMultipleAction(VdcActionType.HibernateVm,
- new
ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[]
{ new HibernateVmParameters(getEntity().getId()) })));
+ new
ArrayList<VdcActionParametersBase>(Arrays.asList(new VdcActionParametersBase[]
{ new VmOperationParameterBase(getEntity().getId()) })));
} else if (StringHelper.stringsEqual(item.getCommandName(),
CommandStop)) {
Frontend.RunMultipleAction(VdcActionType.ShutdownVm,
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index 4e95f62..d9986af 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -14,7 +14,6 @@
import org.ovirt.engine.core.common.action.AttachEntityToTagParameters;
import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters;
import org.ovirt.engine.core.common.action.ChangeVMClusterParameters;
-import org.ovirt.engine.core.common.action.HibernateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmToServerParameters;
import org.ovirt.engine.core.common.action.MoveVmParameters;
@@ -1715,7 +1714,7 @@
for (Object item : getSelectedItems())
{
VM a = (VM) item;
- list.add(new HibernateVmParameters(a.getId()));
+ list.add(new VmOperationParameterBase(a.getId()));
}
Frontend.RunMultipleAction(VdcActionType.HibernateVm, list,
--
To view, visit http://gerrit.ovirt.org/16275
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d9eb34264ab64c54bc12225cc0820b30c40667a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
