Arik Hadas has uploaded a new change for review. Change subject: core: use the right template on template version update ......................................................................
core: use the right template on template version update Move the setting of the template & template id that the VM is going to switch-to in UpdateVmVersionCommand to the constructor. Change-Id: I7dd3475b30267c918497e4971ebd1da1cfb6e58e Bug-Url: https://bugzilla.redhat.com/1149135 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java 1 file changed, 10 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/34303/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java index 2f18f1e..3656c1e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java @@ -1,7 +1,5 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.context.CommandContext; - import java.lang.reflect.Field; import java.util.Collections; import java.util.HashMap; @@ -9,6 +7,7 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.job.ExecutionHandler; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddVmAndAttachToPoolParameters; @@ -60,9 +59,11 @@ super(parameters, cmdContext); parameters.setEntityInfo(new EntityInfo(VdcObjectType.VM, parameters.getVmId())); - // vm should be filled in end action - if (parameters.getVm() != null) { - setVmTemplateId(parameters.getVm().getVmtGuid()); + if (getVm() != null) { + VmTemplate latest = getVmTemplateDAO().getTemplateWithLatestVersionInChain(getVm().getVmtGuid()); + if (latest != null) { + setVmTemplate(latest); + } } } @@ -235,15 +236,11 @@ @Override protected Map<String, Pair<String, String>> getSharedLocks() { // take shared lock on latest template, since we will add vm from it - if (getVm() != null) { - VmTemplate latest = getVmTemplateDAO().getTemplateWithLatestVersionInChain(getVm().getVmtGuid()); - if (latest != null) { - setVmTemplateId(latest.getId()); - setVmTemplate(latest); - return Collections.singletonMap(latest.getId().toString(), - LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED)); - } + if (getVmTemplateId() != null) { + return Collections.singletonMap(getVmTemplateId().toString(), + LockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, VdcBllMessages.ACTION_TYPE_FAILED_OBJECT_LOCKED)); } + return null; } -- To view, visit http://gerrit.ovirt.org/34303 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7dd3475b30267c918497e4971ebd1da1cfb6e58e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
