Moti Asayag has uploaded a new change for review. Change subject: engine: Add new parameter class for CollectNetworkData ......................................................................
engine: Add new parameter class for CollectNetworkData The VDS command CollectVdsNetworkData will require a new parameter class in order to provide a new parameter to the command: skipMgmtNetwork which is designed to specify if a management network should be considered while checking host networks validity. Change-Id: If6986cc378e7d36213da9cb200e8a6098b0d604f Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java 8 files changed, 46 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/14999/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java index 8afa548..3d96a6c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AddBondCommand.java @@ -10,10 +10,10 @@ import org.ovirt.engine.core.common.businessentities.VdsStatic; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; @@ -58,7 +58,7 @@ .getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); if (retVal.getSucceeded()) { // set network status (this can change the network status to diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java index 018fd40..918e4cf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java @@ -17,10 +17,10 @@ import org.ovirt.engine.core.common.queries.InterfaceAndIdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.NetworkUtils; @@ -75,7 +75,7 @@ .getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); if (retVal.getSucceeded()) { Guid groupId = getVdsDAO().get(params.getVdsId()).getVdsGroupId(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java index 12451e9..c042bdb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/DetachNetworkFromVdsInterfaceCommand.java @@ -13,10 +13,10 @@ import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkStatus; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; @@ -69,7 +69,7 @@ .getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); if (retVal.getSucceeded()) { setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java index 6952dcf..9e76be0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/RemoveBondCommand.java @@ -15,10 +15,10 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; @@ -68,7 +68,7 @@ .getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); if (retVal.getSucceeded()) { setSucceeded(true); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java index 792e0d8..3c04cf5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java @@ -19,11 +19,11 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.interfaces.FutureVDSCall; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.FutureVDSCommandType; import org.ovirt.engine.core.common.vdscommands.SetupNetworksVdsCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.log.Log; @@ -175,7 +175,7 @@ // save the new network topology to DB Backend.getInstance().getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); // Update cluster networks (i.e. check if need to activate each new network) for (Network net : getNetworks()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java index adf4eeb..16629b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UpdateNetworkToVdsInterfaceCommand.java @@ -15,10 +15,10 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcFault; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.NetworkVdsmVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.utils.IPAddress; @@ -87,7 +87,7 @@ .getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(getVds())); + new CollectVdsNetworkDataVDSCommandParameters(getVds())); if (retVal.getSucceeded()) { Guid groupId = getVdsDAO().get(getParameters().getVdsId()).getVdsGroupId(); @@ -132,7 +132,7 @@ Backend.getInstance() .getResourceManager() .RunVdsCommand(VDSCommandType.CollectVdsNetworkData, - new VdsIdAndVdsVDSCommandParametersBase(vds)); + new CollectVdsNetworkDataVDSCommandParameters(vds)); } catch (java.lang.Exception e) { } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java new file mode 100644 index 0000000..eb2ab7d --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CollectVdsNetworkDataVDSCommandParameters.java @@ -0,0 +1,30 @@ +package org.ovirt.engine.core.common.vdscommands; + +import org.ovirt.engine.core.common.businessentities.VDS; + +public class CollectVdsNetworkDataVDSCommandParameters extends VdsIdAndVdsVDSCommandParametersBase { + + private boolean skipMgmtNetwork; + + public CollectVdsNetworkDataVDSCommandParameters(VDS host) { + super(host); + } + + public CollectVdsNetworkDataVDSCommandParameters(VDS host, boolean skipMgmtNetwork) { + super(host); + setSkipMgmtNetwork(skipMgmtNetwork); + } + + @Override + public String toString() { + return String.format("%s, skipMgmtNetwork=%s", super.toString(), Boolean.valueOf(skipMgmtNetwork())); + } + + public boolean skipMgmtNetwork() { + return skipMgmtNetwork; + } + + public void setSkipMgmtNetwork(boolean skipMgmtNetwork) { + this.skipMgmtNetwork = skipMgmtNetwork; + } +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java index cc3de76..0df9a81 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CollectVdsNetworkDataVDSCommand.java @@ -19,7 +19,7 @@ import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface.NetworkImplementationDetails; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase; +import org.ovirt.engine.core.common.vdscommands.CollectVdsNetworkDataVDSCommandParameters; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; @@ -30,7 +30,7 @@ import org.ovirt.engine.core.utils.transaction.TransactionSupport; import org.ovirt.engine.core.vdsbroker.ResourceManager; -public class CollectVdsNetworkDataVDSCommand<P extends VdsIdAndVdsVDSCommandParametersBase> +public class CollectVdsNetworkDataVDSCommand<P extends CollectVdsNetworkDataVDSCommandParameters> extends GetCapabilitiesVDSCommand<P> { public CollectVdsNetworkDataVDSCommand(P parameters) { super(parameters); @@ -43,7 +43,7 @@ updateNetConfigDirtyFlag(); // update to db - persistAndEnforceNetworkCompliance(getVds(), false); + persistAndEnforceNetworkCompliance(getVds(), getParameters().skipMgmtNetwork()); ProceedProxyReturnValue(); } -- To view, visit http://gerrit.ovirt.org/14999 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6986cc378e7d36213da9cb200e8a6098b0d604f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
