Moti Asayag has uploaded a new change for review. Change subject: engine: Extract common builder methods to base class ......................................................................
engine: Extract common builder methods to base class Couple of methods are moved to the base class so they can be reused by other builders. Change-Id: Ia67531b028ef698d3f1dd98657ccb93e00b30415 Signed-off-by: Moti Asayag <[email protected]> --- 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/NetworkParametersBuilder.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/RemoveNetworkParametersBuilder.java 3 files changed, 24 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/22889/1 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 8f98419..3ded7e2 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 @@ -10,9 +10,7 @@ import org.ovirt.engine.core.common.action.SetupNetworksParameters; 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.NetworkBootProtocol; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; -import org.ovirt.engine.core.common.businessentities.network.Vlan; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; @@ -37,7 +35,7 @@ VdsNetworkInterface nicToConfigure = getNicToConfigure(setupNetworkParams.getInterfaces(), nic.getId()); if (vlanNetwork) { - VdsNetworkInterface vlan = createVlanDevice(nic, nicToConfigure.getVdsId(), network); + VdsNetworkInterface vlan = createVlanDevice(nic, network); setupNetworkParams.getInterfaces().add(vlan); } else if (nicToConfigure.getNetworkName() == null) { nicToConfigure.setNetworkName(network.getName()); @@ -70,25 +68,6 @@ logable.addCustomValue("HostNames", StringUtils.join(hostNames, ", ")); logable.addCustomValue("Label", network.getLabel()); AuditLogDirector.log(logable, AuditLogType.ADD_NETWORK_BY_LABEL_FAILED); - } - - private VdsNetworkInterface createVlanDevice(VdsNetworkInterface nic, Guid hostId, Network network) { - VdsNetworkInterface vlan = new Vlan(); - vlan.setNetworkName(network.getName()); - vlan.setVdsId(hostId); - vlan.setName(NetworkUtils.getVlanDeviceName(nic, network)); - vlan.setBootProtocol(NetworkBootProtocol.NONE); - return vlan; - } - - private VdsNetworkInterface getNicToConfigure(List<VdsNetworkInterface> nics, Guid id) { - for (VdsNetworkInterface nic : nics) { - if (nic.getId().equals(id)) { - return nic; - } - } - - return null; } private DbFacade getDbFacade() { 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 352a420..48aa7de 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 @@ -4,9 +4,13 @@ import org.ovirt.engine.core.common.action.SetupNetworksParameters; 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; import org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface; +import org.ovirt.engine.core.common.businessentities.network.Vlan; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; +import org.ovirt.engine.core.utils.NetworkUtils; public abstract class NetworkParametersBuilder { protected SetupNetworksParameters createSetupNetworksParameters(Guid hostId) { @@ -20,4 +24,23 @@ private List<VdsNetworkInterface> getHostInterfaces(Guid hostId) { return DbFacade.getInstance().getInterfaceDao().getAllInterfacesForVds(hostId); } + + protected VdsNetworkInterface createVlanDevice(VdsNetworkInterface nic, Network network) { + VdsNetworkInterface vlan = new Vlan(); + vlan.setNetworkName(network.getName()); + vlan.setVdsId(nic.getVdsId()); + vlan.setName(NetworkUtils.getVlanDeviceName(nic, network)); + vlan.setBootProtocol(NetworkBootProtocol.NONE); + return vlan; + } + + protected VdsNetworkInterface getNicToConfigure(List<VdsNetworkInterface> nics, Guid id) { + for (VdsNetworkInterface nic : nics) { + if (nic.getId().equals(id)) { + return nic; + } + } + + return null; + } } 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 2c05f42..d97a209 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 @@ -94,16 +94,6 @@ AuditLogDirector.log(logable, AuditLogType.REMOVE_NETWORK_BY_LABEL_FAILED); } - private VdsNetworkInterface getNicToConfigure(List<VdsNetworkInterface> nics, Guid id) { - for (VdsNetworkInterface nic : nics) { - if (nic.getId().equals(id)) { - return nic; - } - } - - return null; - } - private DbFacade getDbFacade() { return DbFacade.getInstance(); } -- To view, visit http://gerrit.ovirt.org/22889 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia67531b028ef698d3f1dd98657ccb93e00b30415 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
