Alona Kaplan has uploaded a new change for review. Change subject: engine: Adjust Un/LabelNetworkCommand to use commandBase.runInternalAction ......................................................................
engine: Adjust Un/LabelNetworkCommand to use commandBase.runInternalAction UnlabelNetworkCommand and LabelNetworkCommand call UpdateNetworkCommand internally. For unknown reason they used getBackend().runAction(..) for this purpose. Since the call to UpdateNetworkCommand is internal runInternalAction(..) should be called. Due to the last changes to CommandBase- commandBase.runInternalAction(..) should be used. Change-Id: Ibbe6c0e74129c2ae25d540331a93225181ae41c8 Bug-Url: https://bugzilla.redhat.com/1123636 Signed-off-by: Alona Kaplan <alkap...@redhat.com> (cherry picked from commit e71e719e0f8e90b30fb0f7c57ce7de4b07cb963d) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/LabelNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkModification.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UnlabelNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 5 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/30774/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/LabelNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/LabelNetworkCommand.java index 9db23cd..8492803 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/LabelNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/LabelNetworkCommand.java @@ -28,7 +28,7 @@ @Override protected void executeCommand() { getNetwork().setLabel(getLabel()); - VdcReturnValueBase result = getBackend().runAction(VdcActionType.UpdateNetwork, + VdcReturnValueBase result = runInternalAction(VdcActionType.UpdateNetwork, new AddNetworkStoragePoolParameters(getNetwork().getDataCenterId(), getNetwork())); if (!result.getSucceeded()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java index 93bc72f..aaeb5e8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkCommon.java @@ -4,6 +4,7 @@ import java.util.List; import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -22,6 +23,10 @@ super(parameters); } + public NetworkCommon(T parameters, CommandContext cmdContext) { + super(parameters, cmdContext); + } + protected abstract Network getNetwork(); public String getNetworkName() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkModification.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkModification.java index 3172faf..a4bec00 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkModification.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/NetworkModification.java @@ -1,11 +1,16 @@ package org.ovirt.engine.core.bll.network.dc; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; import org.ovirt.engine.core.common.businessentities.network.Network; public abstract class NetworkModification<T extends AddNetworkStoragePoolParameters> extends NetworkCommon<T> { public NetworkModification(T parameters) { - super(parameters); + this(parameters, null); + } + + public NetworkModification(T parameters, CommandContext cmdContext) { + super(parameters, cmdContext); setStoragePoolId(getNetwork().getDataCenterId()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UnlabelNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UnlabelNetworkCommand.java index cf09e40..a16f10e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UnlabelNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UnlabelNetworkCommand.java @@ -27,7 +27,7 @@ @Override protected void executeCommand() { getNetwork().setLabel(null); - VdcReturnValueBase result = getBackend().runAction(VdcActionType.UpdateNetwork, + VdcReturnValueBase result = runInternalAction(VdcActionType.UpdateNetwork, new AddNetworkStoragePoolParameters(getNetwork().getDataCenterId(), getNetwork())); if (!result.getSucceeded()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java index 3f2c9bb..5285115 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java @@ -54,6 +54,10 @@ super(parameters); } + public UpdateNetworkCommand(T parameters, CommandContext commandContext) { + super(parameters, commandContext); + } + @Override protected void executeCommand() { TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { -- To view, visit http://gerrit.ovirt.org/30774 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibbe6c0e74129c2ae25d540331a93225181ae41c8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alona Kaplan <alkap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
