Arik Hadas has uploaded a new change for review.
Change subject: core: InternalMigrateVmCommand cleanup
......................................................................
core: InternalMigrateVmCommand cleanup
Replaced convertInternalMigrateParamsToMigrateParams method in
InternalMigrateVmCommand with a constructor in MigrateVmParameters that
gets as an input InternalMigrateVmParameters instance.
InternalMigrateVmParameters class was moved to
org.ovirt.engine.core.common.action package so that it will be
accessible from MigrateVmParameters class (and that package it should be
in anyway as all the parameters class resides there)
On the way two minor changes were made in order to support later
patches:
1. a constructor that also gets the parent command was added to
InternalMigrateVmParameters
2. the correlation-id is also copied from the
InternalMigrateVmParameters on the newly added constructor in
MigrateVmParameters
Change-Id: Idfeb4966b6ae0a570904861a5e6b1768b0c6d47f
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InternalMigrateVmParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MigrateVmParameters.java
3 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/11368/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java
index c37a100..9ce0972 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmCommand.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.bll;
+import org.ovirt.engine.core.common.action.InternalMigrateVmParameters;
import org.ovirt.engine.core.common.action.MigrateVmParameters;
import org.ovirt.engine.core.common.businessentities.MigrationSupport;
import org.ovirt.engine.core.compat.Guid;
@@ -9,7 +10,7 @@
public class InternalMigrateVmCommand<T extends InternalMigrateVmParameters>
extends MigrateVmCommand<MigrateVmParameters> {
public InternalMigrateVmCommand(T parameters) {
- super(convertInternalMigrateParamsToMigrateParams(parameters));
+ super(new MigrateVmParameters(parameters));
}
@Override
@@ -36,15 +37,5 @@
else {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_VM_IS_NON_MIGRTABLE);
}
- }
-
- private static MigrateVmParameters
convertInternalMigrateParamsToMigrateParams(InternalMigrateVmParameters
internalMigrateVmParameters) {
- MigrateVmParameters migrateVmParameters = new MigrateVmParameters();
-
- migrateVmParameters.setVmId(internalMigrateVmParameters.getVmId());
- migrateVmParameters.setForceMigrationForNonMigratableVM(false);
-
migrateVmParameters.setTransactionScopeOption(internalMigrateVmParameters.getTransactionScopeOption());
-
- return migrateVmParameters;
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InternalMigrateVmParameters.java
similarity index 67%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmParameters.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InternalMigrateVmParameters.java
index 0abd6ef..1580b54 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InternalMigrateVmParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InternalMigrateVmParameters.java
@@ -1,6 +1,5 @@
-package org.ovirt.engine.core.bll;
+package org.ovirt.engine.core.common.action;
-import org.ovirt.engine.core.common.action.VmOperationParameterBase;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.TransactionScopeOption;
@@ -14,4 +13,9 @@
this();
setVmId(vmId);
}
+
+ public InternalMigrateVmParameters(Guid vmId, VdcActionType parentCommand)
{
+ this(vmId);
+ setParentCommand(parentCommand);
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MigrateVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MigrateVmParameters.java
index 226f002..905ddb1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MigrateVmParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MigrateVmParameters.java
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.ovirt.engine.core.common.action;
import org.ovirt.engine.core.compat.Guid;
@@ -16,16 +13,24 @@
public MigrateVmParameters() {
}
+ public MigrateVmParameters(boolean forceMigrationForNonMigratableVM, Guid
vmId) {
+ super(vmId);
+
+ setForceMigrationForNonMigratableVM(forceMigrationForNonMigratableVM);
+ }
+
+ public MigrateVmParameters(InternalMigrateVmParameters
internalMigrateVmParameters) {
+ this(false, internalMigrateVmParameters.getVmId());
+
+
setTransactionScopeOption(internalMigrateVmParameters.getTransactionScopeOption());
+ setCorrelationId(internalMigrateVmParameters.getCorrelationId());
+ }
+
public boolean isForceMigrationForNonMigratableVM() {
return forceMigrationForNonMigratableVM;
}
public void setForceMigrationForNonMigratableVM(boolean
forceMigrationForNonMigratableVM) {
- this.forceMigrationForNonMigratableVM =
forceMigrationForNonMigratableVM;
- }
-
- public MigrateVmParameters(boolean forceMigrationForNonMigratableVM, Guid
vmId) {
- super(vmId);
this.forceMigrationForNonMigratableVM =
forceMigrationForNonMigratableVM;
}
--
To view, visit http://gerrit.ovirt.org/11368
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfeb4966b6ae0a570904861a5e6b1768b0c6d47f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
