Lior Vernia has uploaded a new change for review. Change subject: engine: Relaxed slave interface validation ......................................................................
engine: Relaxed slave interface validation Validation used to demand that no boot protocol, IP address etc. be defined on the slave interfaces, whereas this seems to be quite common when using Fedora 19 hosts. This is erased by VDSM anyway, so there's no real reason to block this on the engine side. Change-Id: I564325fd0ac0cf54d2bff7c155a7a67f32507711 Bug-Url: https://bugzilla.redhat.com/1082296 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java 1 file changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/26346/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java index 321e8b3..9cf284d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/NetworkInterfaceValidator.java @@ -49,7 +49,6 @@ * Validate the slave is configured properly by the following traits: * <ul> * <li>No network name</li> - * <li>No boot protocol: no address, subnet, gateway or boot protocol</li> * <li>No vlan configured, either as part of the name or explicitly by {@link VdsNetworkInterface#getVlanId()}</li> * </ul> * @@ -58,11 +57,7 @@ * @return {@code true} if the slave is configured properly. */ private boolean validateSlave(VdsNetworkInterface slave) { - return (slave.getBootProtocol() == null || slave.getBootProtocol() == NetworkBootProtocol.NONE) - && isEmpty(slave.getNetworkName()) - && isEmpty(slave.getAddress()) - && isEmpty(slave.getSubnet()) - && isEmpty(slave.getGateway()) + return isEmpty(slave.getNetworkName()) && (slave.getName() == null || !slave.getName().contains(".")) && slave.getVlanId() == null; } -- To view, visit http://gerrit.ovirt.org/26346 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I564325fd0ac0cf54d2bff7c155a7a67f32507711 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
