Mike Kolesnik has uploaded a new change for review. Change subject: engine: Explicit MAC independent of pool size ......................................................................
engine: Explicit MAC independent of pool size Explicit MAC was changed by mistake to be dependent on the MAC pool size, changing back so that if an explicit MAC address is specified the pool is not checked if more MACs are available or not. Change-Id: I073a6fafee23211f6a66a03767a6913b5b564650 Bug-Url: https://bugzilla.redhat.com/1039103 Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/22186/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java index 8f5b89d..d3ade1c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java @@ -136,8 +136,10 @@ return false; } - if (StringUtils.isNotEmpty(getMacAddress()) && !validate(macAvailable())) { - return false; + if (StringUtils.isNotEmpty(getMacAddress())) { + if (!validate(macAvailable())) { + return false; + } } else if (MacPoolManager.getInstance().getAvailableMacsCount() <= 0) { addCanDoActionMessage(VdcBllMessages.MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES); return false; -- To view, visit http://gerrit.ovirt.org/22186 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I073a6fafee23211f6a66a03767a6913b5b564650 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
