Moti Asayag has uploaded a new change for review. Change subject: engine: Extract base class NetworkParametersBuilder ......................................................................
engine: Extract base class NetworkParametersBuilder The class will serve as a base class for setupNetworks parameters builders in the various scenarios: sync networks, adding networks or removing a network. Change-Id: I936cc52bf2c0badf0289e1afbd4af1c1617aa6b2 Signed-off-by: Moti Asayag <[email protected]> --- A 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/dc/UpdateNetworkCommand.java 2 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/22707/1 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 new file mode 100644 index 0000000..352a420 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkParametersBuilder.java @@ -0,0 +1,23 @@ +package org.ovirt.engine.core.bll.network; + +import java.util.List; + +import org.ovirt.engine.core.common.action.SetupNetworksParameters; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dal.dbbroker.DbFacade; + +public abstract class NetworkParametersBuilder { + protected SetupNetworksParameters 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); + } + + private List<VdsNetworkInterface> getHostInterfaces(Guid hostId) { + return DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds(hostId); + } +} 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 4a2e6f4..54dee99 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 @@ -12,7 +12,7 @@ import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute; import org.ovirt.engine.core.bll.RenamedEntityInfoProvider; import org.ovirt.engine.core.bll.ValidationResult; -import org.ovirt.engine.core.bll.network.NetworkConfigurator; +import org.ovirt.engine.core.bll.network.NetworkParametersBuilder; 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; @@ -22,7 +22,6 @@ import org.ovirt.engine.core.common.action.SetupNetworksParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; @@ -267,21 +266,9 @@ } - private class SyncNetworkParametersBuilder { + private class SyncNetworkParametersBuilder extends NetworkParametersBuilder{ - private SetupNetworksParameters 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); - } - - private List<VdsNetworkInterface> getHostInterfaces(Guid hostId) { - return getDbFacade().getInterfaceDao().getAllInterfacesForVds(hostId); - } - - protected ArrayList<VdcActionParametersBase> buildParameters(Network network) { + private ArrayList<VdcActionParametersBase> buildParameters(Network network) { ArrayList<VdcActionParametersBase> parameters = new ArrayList<>(); List<VdsNetworkInterface> nics = getDbFacade().getInterfaceDao().getVdsInterfacesByNetworkId(getNetwork().getId()); -- To view, visit http://gerrit.ovirt.org/22707 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I936cc52bf2c0badf0289e1afbd4af1c1617aa6b2 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
