Alona Kaplan has uploaded a new change for review. Change subject: engine: introduce RefreshHostCommand ......................................................................
engine: introduce RefreshHostCommand It combains a call to VDSCommandType.CollectVdsNetworkData and RefreshHostDevices. Change-Id: Ieee263b7ee1773c777febd6be21a1a21d0d02ae2 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RefreshHostCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateHostNicVfsConfigCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java 4 files changed, 39 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/39892/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java index b13f780..caf75a9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RefreshHostCapabilitiesCommand.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.Map; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; @@ -20,6 +21,10 @@ super(parameters); } + public RefreshHostCapabilitiesCommand(T parameters, CommandContext commandContext) { + super(parameters, commandContext); + } + @Override protected LockProperties applyLockProperties(LockProperties lockProperties) { return lockProperties.withScope(Scope.Execution); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RefreshHostCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RefreshHostCommand.java new file mode 100644 index 0000000..e733494 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RefreshHostCommand.java @@ -0,0 +1,31 @@ +package org.ovirt.engine.core.bll.network.host; + +import org.ovirt.engine.core.bll.VdsCommand; +import org.ovirt.engine.core.bll.context.CommandContext; +import org.ovirt.engine.core.common.action.VdcActionType; +import org.ovirt.engine.core.common.action.VdsActionParameters; + +public class RefreshHostCommand extends VdsCommand<VdsActionParameters> { + + public RefreshHostCommand(VdsActionParameters parameters) { + super(parameters); + } + + public RefreshHostCommand(VdsActionParameters parameters, CommandContext commandContext) { + super(parameters, commandContext); + } + + @Override + protected void executeCommand() { + setVdsId(getParameters().getVdsId()); + + VdsActionParameters vdsActionParams = new VdsActionParameters(getVdsId()); + boolean succeeded = runInternalAction(VdcActionType.RefreshHostCapabilities, vdsActionParams).getSucceeded(); + if (succeeded) { + succeeded = runInternalAction(VdcActionType.RefreshHostDevices, vdsActionParams).getSucceeded(); + } + + setSucceeded(succeeded); + } + +} diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateHostNicVfsConfigCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateHostNicVfsConfigCommand.java index 33aea11..f94870c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateHostNicVfsConfigCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateHostNicVfsConfigCommand.java @@ -11,11 +11,9 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.businessentities.network.HostNicVfsConfig; -import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.errors.VdcBllMessages; -import org.ovirt.engine.core.common.vdscommands.CollectHostNetworkDataVdsCommandParameters; import org.ovirt.engine.core.common.vdscommands.HostDevChangeNumVfsVDSParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; @@ -100,18 +98,8 @@ } private boolean refreshHost() { - // save the new network topology to DB - VDSReturnValue returnValue = - runVdsCommand(VDSCommandType.CollectVdsNetworkData, - new CollectHostNetworkDataVdsCommandParameters(getVds(), - Collections.<VdsNetworkInterface> emptyList())); - - if (returnValue.getSucceeded()) { VdsActionParameters vdsActionParams = new VdsActionParameters(getVdsId()); - return runInternalAction(VdcActionType.RefreshHostDevices, vdsActionParams).getSucceeded(); - } - - return false; + return runInternalAction(VdcActionType.RefreshHost, vdsActionParams).getSucceeded(); } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index adcbfff..4af359ba 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -440,7 +440,8 @@ RemoveAllVmCinderDisks(3203, QuotaDependency.STORAGE), // Host Devices - RefreshHostDevices(4000, ActionGroup.MANIPULATE_HOST, false, QuotaDependency.NONE); + RefreshHostDevices(4000, ActionGroup.MANIPULATE_HOST, false, QuotaDependency.NONE), + RefreshHost(4001, QuotaDependency.NONE); private int intValue; private ActionGroup actionGroup; -- To view, visit https://gerrit.ovirt.org/39892 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieee263b7ee1773c777febd6be21a1a21d0d02ae2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
