Moti Asayag has uploaded a new change for review.
Change subject: engine: Extract network creation logic into method
......................................................................
engine: Extract network creation logic into method
The network creation logic can and will be reused.
For that purpose it is being extracted into a base class.
Change-Id: I18c1992c14603e5f00d4b7e26b9d27100e8ccf33
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
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/host/LabelNicCommand.java
2 files changed, 24 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/23189/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
index 6fa3b82..fe1293a 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
@@ -12,6 +12,8 @@
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.common.errors.VdcBLLException;
+import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -73,6 +75,27 @@
protected void addValuesToLog(AuditLogableBase logable) {
}
+ /**
+ * Configure a network on a given network interface if the network is not
a vlan or add a newly created vlan device
+ * based on the given nic to the host interface
+ *
+ * @param nic
+ * the underlying nic (interface or bond)
+ * @param nics
+ * the host nics to which a vlan should be added
+ * @param network
+ * the network to attach
+ */
+ protected void configureNetwork(VdsNetworkInterface nic,
List<VdsNetworkInterface> nics, Network network) {
+ if (NetworkUtils.isVlan(network)) {
+ nics.add(createVlanDevice(nic, network));
+ } else if (StringUtils.isEmpty(nic.getNetworkName())) {
+ nic.setNetworkName(network.getName());
+ } else {
+ throw new VdcBLLException(VdcBllErrors.NETWORK_LABEL_CONFLICT);
+ }
+ }
+
private DbFacade getDbFacade() {
return DbFacade.getInstance();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
index 0a758ee..c43bcc1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/LabelNicCommand.java
@@ -204,13 +204,7 @@
public List<VdsNetworkInterface> configureNetworks(VdsNetworkInterface
nic, Set<Network> networks) {
List<VdsNetworkInterface> vlans = new ArrayList<>();
for (Network network : networks) {
- if (NetworkUtils.isVlan(network)) {
- vlans.add(createVlanDevice(nic, network));
- } else if (StringUtils.isEmpty(nic.getNetworkName())) {
- nic.setNetworkName(network.getName());
- } else {
- throw new
VdcBLLException(VdcBllErrors.NETWORK_LABEL_CONFLICT);
- }
+ configureNetwork(nic, vlans, network);
}
return vlans;
--
To view, visit http://gerrit.ovirt.org/23189
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18c1992c14603e5f00d4b7e26b9d27100e8ccf33
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
