Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: update RemoveNetworkParametersBuilder logic ......................................................................
engine: update RemoveNetworkParametersBuilder logic Remove usage of legacy NetworkUtils.isManagementNetwork with the new ManagementNetworkUtil one in RemoveNetworkParametersBuilder. Change-Id: I519b9d4db919f143a36c3b15fbaa21e8380311f5 Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- 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/cluster/NetworkHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java 3 files changed, 28 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/33820/14 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 e795256..f3e71dc 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 @@ -5,7 +5,9 @@ import java.util.List; import java.util.Set; +import org.apache.commons.lang.Validate; import org.ovirt.engine.core.bll.context.CommandContext; +import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil; import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.PersistentSetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -19,18 +21,26 @@ public class RemoveNetworkParametersBuilder extends NetworkParametersBuilder { - private Network network; + private final Network network; + private final ManagementNetworkUtil managementNetworkUtil; - public RemoveNetworkParametersBuilder(Network network, CommandContext commandContext) { + public RemoveNetworkParametersBuilder(Network network, + CommandContext commandContext, + ManagementNetworkUtil managementNetworkUtil) { super(commandContext); + + Validate.notNull(network, "network cannot be null"); + Validate.notNull(managementNetworkUtil, "managementNetworkUtil cannot be null"); + this.network = network; + this.managementNetworkUtil = managementNetworkUtil; } public ArrayList<VdcActionParametersBase> buildParameters(List<VdsNetworkInterface> nics) { Set<Guid> nonUpdateableHosts = new HashSet<>(); ArrayList<VdcActionParametersBase> parameters = new ArrayList<>(); - if (NetworkUtils.isManagementNetwork(network)) { + if (managementNetworkUtil.isManagementNetwork(network.getId())) { return parameters; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java index 072ac05..fc9b5f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java @@ -9,6 +9,7 @@ import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.network.NetworkParametersBuilder; import org.ovirt.engine.core.bll.network.RemoveNetworkParametersBuilder; +import org.ovirt.engine.core.bll.utils.Injector; import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -124,7 +125,11 @@ } private static void removeNetworkFromHosts(Network network, CommandContext context, List<VdsNetworkInterface> nics) { - RemoveNetworkParametersBuilder builder = new RemoveNetworkParametersBuilder(network, context); + + final ManagementNetworkUtil managementNetworkUtil = Injector.get(ManagementNetworkUtil.class); + + RemoveNetworkParametersBuilder builder = + new RemoveNetworkParametersBuilder(network, context, managementNetworkUtil); ArrayList<VdcActionParametersBase> parameters = builder.buildParameters(nics); if (!parameters.isEmpty()) { 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 cf1a1ee..aad1630 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 @@ -10,6 +10,8 @@ import java.util.Objects; import java.util.Set; +import javax.inject.Inject; + import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; @@ -20,6 +22,7 @@ import org.ovirt.engine.core.bll.network.AddNetworkParametersBuilder; import org.ovirt.engine.core.bll.network.NetworkParametersBuilder; import org.ovirt.engine.core.bll.network.RemoveNetworkParametersBuilder; +import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil; import org.ovirt.engine.core.bll.network.cluster.NetworkClusterHelper; import org.ovirt.engine.core.bll.network.cluster.NetworkHelper; import org.ovirt.engine.core.bll.validator.NetworkValidator; @@ -48,6 +51,10 @@ @NonTransactiveCommandAttribute public class UpdateNetworkCommand<T extends AddNetworkStoragePoolParameters> extends NetworkModification<T> implements RenamedEntityInfoProvider { + + @Inject + private ManagementNetworkUtil managementNetworkUtil; + private Network oldNetwork; public UpdateNetworkCommand(T parameters) { @@ -429,7 +436,8 @@ } private ArrayList<VdcActionParametersBase> createRemoveNetworkParameters(List<VdsNetworkInterface> nicsForRemove) { - RemoveNetworkParametersBuilder builder = new RemoveNetworkParametersBuilder(getOldNetwork(), getContext()); + RemoveNetworkParametersBuilder builder = + new RemoveNetworkParametersBuilder(getOldNetwork(), getContext(), managementNetworkUtil); return builder.buildParameters(nicsForRemove); } -- To view, visit http://gerrit.ovirt.org/33820 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I519b9d4db919f143a36c3b15fbaa21e8380311f5 Gerrit-PatchSet: 14 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: Alona Kaplan <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
