Moti Asayag has uploaded a new change for review. Change subject: engine: Use NetworkUtils.isVlan() where possible ......................................................................
engine: Use NetworkUtils.isVlan() where possible Change-Id: Icacd36aed514174044e57ef13801c0b4de3cd662 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/22784/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java index 0109357..7345e51 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/AttachNetworkToVdsInterfaceCommand.java @@ -223,6 +223,6 @@ } private boolean vmNetworkNonVlan(Network network) { - return network.isVmNetwork() && network.getVlanId() == null; + return network.isVmNetwork() && !NetworkUtils.isVlan(network); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java index 8acb6e2..709f84f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/OpenstackNetworkProviderProxy.java @@ -18,6 +18,7 @@ import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.errors.VdcBLLException; import org.ovirt.engine.core.common.errors.VdcBllErrors; +import org.ovirt.engine.core.utils.NetworkUtils; import com.woorea.openstack.base.client.HttpMethod; import com.woorea.openstack.base.client.OpenStackRequest; @@ -70,11 +71,11 @@ networkForCreate.setName(network.getName()); if (network.getLabel() != null) { networkForCreate.setProviderPhysicalNetwork(network.getLabel()); - if (network.getVlanId() == null) { - networkForCreate.setProviderNetworkType(FLAT_NETWORK); - } else { + if (NetworkUtils.isVlan(network)) { networkForCreate.setProviderNetworkType(VLAN_NETWORK); networkForCreate.setProviderSegmentationId(network.getVlanId()); + } else { + networkForCreate.setProviderNetworkType(FLAT_NETWORK); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java index ddbc64b..a06020f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkValidator.java @@ -86,9 +86,9 @@ * @return An error iff a different network in the data center is already using the specified VLAN ID. */ public ValidationResult vlanIdNotUsed() { - if (network.getVlanId() != null) { + if (NetworkUtils.isVlan(network)) { for (Network otherNetwork : getNetworks()) { - if (otherNetwork.getVlanId() != null + if (NetworkUtils.isVlan(otherNetwork) && otherNetwork.getVlanId().equals(network.getVlanId()) && !otherNetwork.getId().equals(network.getId())) { return new ValidationResult(VdcBllMessages.NETWORK_VLAN_IN_USE, -- To view, visit http://gerrit.ovirt.org/22784 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icacd36aed514174044e57ef13801c0b4de3cd662 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
