Mike Kolesnik has uploaded a new change for review. Change subject: engine: Add PersistentSetupNetworksParameters ......................................................................
engine: Add PersistentSetupNetworksParameters This parameters class will be used to print audit logging where it's necessary due to running multiple PersistentSetupNetworks commands. Change-Id: I94972492a2c87c302f07d4ccc5b7ed9e204d27dc Related-To: https://bugzilla.redhat.com/1055161 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> (cherry picked from commit d07d1f61795c48692397ecc1187c97cd0988b266) --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworksByLabelParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java 9 files changed, 40 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/24356/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index e123b64..a5dcb98 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -17,7 +17,7 @@ import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.ChangeVDSClusterParameters; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.action.VdsActionParameters; @@ -228,7 +228,7 @@ private void configureNetworks() { ChangeClusterParametersBuilder builder = new ChangeClusterParametersBuilder(); - final SetupNetworksParameters params; + final PersistentSetupNetworksParameters params; try { params = builder.buildParameters(getVdsId(), getSourceCluster().getId(), getTargetCluster().getId()); @@ -354,11 +354,11 @@ private class ChangeClusterParametersBuilder extends NetworkParametersBuilder { - public SetupNetworksParameters buildParameters(Guid hostId, Guid sourceClusterId, Guid targetClusterId) { + public PersistentSetupNetworksParameters buildParameters(Guid hostId, Guid sourceClusterId, Guid targetClusterId) { List<Network> targetClusterNetworks = getNetworkDAO().getAllForCluster(targetClusterId); Map<String, Network> targetClusterNetworksByName = Entities.entitiesByName(targetClusterNetworks); - SetupNetworksParameters params = createSetupNetworksParameters(hostId); + PersistentSetupNetworksParameters params = createSetupNetworksParameters(hostId); Map<String, VdsNetworkInterface> nicsByNetwork = Entities.hostInterfacesByNetworkName(params.getInterfaces()); Map<String, List<Network>> targetNetworksByLabel = getClusterNetworksByLabel(targetClusterNetworks); @@ -402,7 +402,7 @@ public void adjustNetworksByLabel(Map<String, List<Network>> sourceNetworksByLabel, Map<String, Network> targetNetworksByName, Map<String, List<Network>> targetNetworksByLabel, - SetupNetworksParameters params, + PersistentSetupNetworksParameters params, Map<String, VdsNetworkInterface> nicsByNetwork, VdsNetworkInterface nic) { if (!NetworkUtils.isLabeled(nic)) { @@ -441,7 +441,9 @@ return nicsByNetwork.containsKey(net.getName()) && !targetNetworksByName.containsKey(net.getName()); } - public void removeNetworkFromParameters(SetupNetworksParameters params, VdsNetworkInterface nic, Network net) { + public void removeNetworkFromParameters(PersistentSetupNetworksParameters params, + VdsNetworkInterface nic, + Network net) { if (NetworkUtils.isVlan(net)) { VdsNetworkInterface vlan = getVlanDevice(params.getInterfaces(), nic, net); if (vlan == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java index 9cf8a46..df178b8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworkParametersBuilder.java @@ -6,7 +6,7 @@ import java.util.Set; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; @@ -30,7 +30,7 @@ boolean vlanNetwork = NetworkUtils.isVlan(network); for (VdsNetworkInterface nic : nics) { - SetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(nic.getVdsId()); + PersistentSetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(nic.getVdsId()); VdsNetworkInterface nicToConfigure = getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId()); if (nicToConfigure == null) { throw new VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworksByLabelParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworksByLabelParametersBuilder.java index a939e2c..5e131dd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworksByLabelParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/AddNetworksByLabelParametersBuilder.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; @@ -20,10 +20,10 @@ /** * Adds a list of labeled networks to a given interface */ - public SetupNetworksParameters buildParameters(VdsNetworkInterface nic, + public PersistentSetupNetworksParameters buildParameters(VdsNetworkInterface nic, String label, List<Network> labeledNetworks) { - SetupNetworksParameters parameters = createSetupNetworksParameters(nic.getVdsId()); + PersistentSetupNetworksParameters parameters = createSetupNetworksParameters(nic.getVdsId()); Set<Network> networkToAdd = getNetworksToConfigure(parameters.getInterfaces(), labeledNetworks); VdsNetworkInterface nicToConfigure = getNicToConfigure(parameters.getInterfaces(), nic.getId()); if (nicToConfigure == null) { @@ -41,10 +41,10 @@ /** * Adds a list of labeled networks to a host */ - public SetupNetworksParameters buildParameters(Guid vdsId, + public PersistentSetupNetworksParameters buildParameters(Guid vdsId, List<Network> labeledNetworks, Map<String, VdsNetworkInterface> nicsByLabel) { - SetupNetworksParameters parameters = createSetupNetworksParameters(vdsId); + PersistentSetupNetworksParameters parameters = createSetupNetworksParameters(vdsId); Set<Network> networkToAdd = getNetworksToConfigure(parameters.getInterfaces(), labeledNetworks); for (Network network : networkToAdd) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java index 020e2a1..b21a081 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; @@ -25,12 +25,17 @@ public NetworkParametersBuilder() { } - protected SetupNetworksParameters createSetupNetworksParameters(Guid hostId) { + protected PersistentSetupNetworksParameters createSetupNetworksParameters(Guid hostId) { VDS host = new VDS(); host.setId(hostId); NetworkConfigurator configurator = new NetworkConfigurator(host); List<VdsNetworkInterface> nics = configurator.filterBondsWithoutSlaves(getHostInterfaces(hostId)); - return configurator.createSetupNetworkParams(nics); + + PersistentSetupNetworksParameters parameters = new PersistentSetupNetworksParameters(); + parameters.setVdsId(host.getId()); + parameters.setInterfaces(nics); + parameters.setCheckConnectivity(true); + return parameters; } private List<VdsNetworkInterface> getHostInterfaces(Guid hostId) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java index c1b24dc..7601877 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java @@ -6,7 +6,7 @@ import java.util.Set; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; @@ -35,7 +35,7 @@ boolean vlanNetwork = NetworkUtils.isVlan(network); for (VdsNetworkInterface nic : nics) { - SetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(nic.getVdsId()); + PersistentSetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(nic.getVdsId()); VdsNetworkInterface nicToConfigure = getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId()); if (nicToConfigure == null) { throw new VdcBLLException(VdcBllErrors.LABELED_NETWORK_INTERFACE_NOT_FOUND); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java index e603f46..f7049e3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworksByLabelParametersBuilder.java @@ -6,7 +6,7 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; @@ -21,8 +21,8 @@ /** * Removes labeled networks from an interface by a given label */ - public SetupNetworksParameters buildParameters(VdsNetworkInterface nic, String label, Guid clusterId) { - SetupNetworksParameters parameters = createSetupNetworksParameters(nic.getVdsId()); + public PersistentSetupNetworksParameters buildParameters(VdsNetworkInterface nic, String label, Guid clusterId) { + PersistentSetupNetworksParameters parameters = createSetupNetworksParameters(nic.getVdsId()); List<Network> labeledNetworks = DbFacade.getInstance().getNetworkDao().getAllByLabelForCluster(label, clusterId); VdsNetworkInterface nicToConfigure = getNicToConfigure(parameters.getInterfaces(), nic.getId()); @@ -44,10 +44,10 @@ /** * Removes a given list of labeled networks from a host */ - public SetupNetworksParameters buildParameters(Guid hostId, + public PersistentSetupNetworksParameters buildParameters(Guid hostId, List<Network> networksToRemove, List<VdsNetworkInterface> nics) { - SetupNetworksParameters parameters = createSetupNetworksParameters(hostId); + PersistentSetupNetworksParameters parameters = createSetupNetworksParameters(hostId); for (VdsNetworkInterface nic : nics) { VdsNetworkInterface nicToConfigure = getNicToConfigure(parameters.getInterfaces(), nic.getId()); 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 ae7b25b..a34a1a6 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 @@ -24,7 +24,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddNetworkStoragePoolParameters; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VM; @@ -419,7 +419,7 @@ } for (Guid hostId : hostIdsToSync) { - SetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(hostId); + PersistentSetupNetworksParameters setupNetworkParams = createSetupNetworksParameters(hostId); setupNetworkParams.setNetworksToSync(Collections.singletonList(getNetworkName())); parameters.add(setupNetworkParams); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java index e111ce0..526cc5f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/PersistentSetupNetworksCommand.java @@ -3,14 +3,14 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.VdsCommand; import org.ovirt.engine.core.bll.network.host.SetupNetworksCommand.SETUP_NETWORKS_RESOLUTION; -import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; import org.ovirt.engine.core.common.action.VdsActionParameters; import org.ovirt.engine.core.common.errors.VdcBllMessages; @NonTransactiveCommandAttribute -public class PersistentSetupNetworksCommand<T extends SetupNetworksParameters> extends VdsCommand<T> { +public class PersistentSetupNetworksCommand<T extends PersistentSetupNetworksParameters> extends VdsCommand<T> { public PersistentSetupNetworksCommand(T parameters) { super(parameters); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java new file mode 100644 index 0000000..8fd386c --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/PersistentSetupNetworksParameters.java @@ -0,0 +1,6 @@ +package org.ovirt.engine.core.common.action; + +public class PersistentSetupNetworksParameters extends SetupNetworksParameters { + + private static final long serialVersionUID = 2120379740832172688L; +} -- To view, visit http://gerrit.ovirt.org/24356 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I94972492a2c87c302f07d4ccc5b7ed9e204d27dc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
