Alona Kaplan has uploaded a new change for review.
Change subject: engine: Use ProcessDownVmParameters instead of IdParameters
......................................................................
engine: Use ProcessDownVmParameters instead of IdParameters
Besides the vmId ProcessDownVmParameters will also contain whether the
refresh of the host should be skipped.
Change-Id: I913ecde00122d190b45d0e8a0ce98886ec7f1b6a
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsVmsOperation.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
A
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessDownVmParameters.java
7 files changed, 38 insertions(+), 11 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/39895/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
index fc93bad..2100574 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearNonResponsiveVdsVmsCommand.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.IdParameters;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdsActionParameters;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
@@ -62,7 +62,7 @@
logSettingVmToDown(getVds().getId(), vm.getId());
}
- runInternalActionWithTasksContext(VdcActionType.ProcessDownVm, new
IdParameters(vm.getId()));
+ runInternalActionWithTasksContext(VdcActionType.ProcessDownVm, new
ProcessDownVmParameters(vm.getId()));
}
runVdsCommand(VDSCommandType.UpdateVdsVMsCleared,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
index 5c92bb2..ebac40b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ProcessDownVmCommand.java
@@ -9,6 +9,7 @@
import org.ovirt.engine.core.bll.snapshots.SnapshotsManager;
import org.ovirt.engine.core.bll.utils.PermissionSubject;
import org.ovirt.engine.core.common.action.IdParameters;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VmManagementParametersBase;
import org.ovirt.engine.core.common.action.VmOperationParameterBase;
@@ -33,7 +34,7 @@
@InternalCommandAttribute
@NonTransactiveCommandAttribute
-public class ProcessDownVmCommand<T extends IdParameters> extends
CommandBase<T> {
+public class ProcessDownVmCommand<T extends ProcessDownVmParameters> extends
CommandBase<T> {
private static final Logger log =
LoggerFactory.getLogger(ProcessDownVmCommand.class);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsVmsOperation.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsVmsOperation.java
index 36d21c3..cdb4aeb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsVmsOperation.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsVmsOperation.java
@@ -6,7 +6,7 @@
import org.ovirt.engine.core.bll.context.CommandContext;
import org.ovirt.engine.core.bll.job.ExecutionHandler;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.action.IdParameters;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VM;
@@ -117,7 +117,7 @@
}
Backend.getInstance().runInternalAction(
VdcActionType.ProcessDownVm,
- new IdParameters(vm.getId()),
+ new ProcessDownVmParameters(vm.getId()),
ExecutionHandler.createDefaultContextForTasks(commandContext)
);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index 7859ea6..8f62c1d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -34,9 +34,9 @@
import org.ovirt.engine.core.common.FeatureSupported;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.CreateAllSnapshotsFromVmParameters;
-import org.ovirt.engine.core.common.action.IdParameters;
import org.ovirt.engine.core.common.action.LockProperties;
import org.ovirt.engine.core.common.action.LockProperties.Scope;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.RunVmParams;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VdcReturnValueBase;
@@ -485,7 +485,7 @@
private void removeVmStatlessImages() {
runInternalAction(VdcActionType.ProcessDownVm,
- new IdParameters(getVm().getId()),
+ new ProcessDownVmParameters(getVm().getId()),
ExecutionHandler.createDefaultContextForTasks(getContext(),
getLock()));
// setting lock to null in order not to release lock twice
setLock(null);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
index af75647..1f0be2a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java
@@ -16,7 +16,7 @@
import org.ovirt.engine.core.bll.scheduling.RunVmDelayer;
import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator;
import org.ovirt.engine.core.bll.storage.StorageHelperDirector;
-import org.ovirt.engine.core.common.action.IdParameters;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;
@@ -153,7 +153,7 @@
public void run() {
runInternalActionWithTasksContext(
VdcActionType.ProcessDownVm,
- new IdParameters(getVm().getId())
+ new ProcessDownVmParameters(getVm().getId())
);
}
});
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
index 1fbd5e0..d6d84f1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
@@ -26,9 +26,9 @@
import
org.ovirt.engine.core.common.action.ConnectHostToStoragePoolServersParameters;
import org.ovirt.engine.core.common.action.FenceVdsActionParameters;
import org.ovirt.engine.core.common.action.HostStoragePoolParametersBase;
-import org.ovirt.engine.core.common.action.IdParameters;
import org.ovirt.engine.core.common.action.MaintenanceNumberOfVdssParameters;
import org.ovirt.engine.core.common.action.MigrateVmToServerParameters;
+import org.ovirt.engine.core.common.action.ProcessDownVmParameters;
import org.ovirt.engine.core.common.action.ReconstructMasterParameters;
import org.ovirt.engine.core.common.action.SetNonOperationalVdsParameters;
import org.ovirt.engine.core.common.action.SetStoragePoolStatusParameters;
@@ -193,7 +193,7 @@
public void run() {
for (Guid vmId : vmIds) {
Backend.getInstance().runInternalAction(VdcActionType.ProcessDownVm,
- new IdParameters(vmId));
+ new ProcessDownVmParameters(vmId));
}
}
});
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessDownVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessDownVmParameters.java
new file mode 100644
index 0000000..8af3aed
--- /dev/null
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProcessDownVmParameters.java
@@ -0,0 +1,26 @@
+package org.ovirt.engine.core.common.action;
+
+import org.ovirt.engine.core.compat.Guid;
+
+public class ProcessDownVmParameters extends IdParameters {
+ private static final long serialVersionUID = 6766562035910087308L;
+
+ private boolean skipHostRefresh;
+
+ public ProcessDownVmParameters() {
+ super();
+ }
+
+ public ProcessDownVmParameters(Guid id) {
+ super(id);
+ }
+
+ public ProcessDownVmParameters(Guid id, boolean skipHostRefresh) {
+ this(id);
+ this.skipHostRefresh = skipHostRefresh;
+ }
+
+ public boolean isSkipHostRefresh() {
+ return skipHostRefresh;
+ }
+}
--
To view, visit https://gerrit.ovirt.org/39895
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I913ecde00122d190b45d0e8a0ce98886ec7f1b6a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
