Moti Asayag has uploaded a new change for review. Change subject: engine: Consider case-sensitivity for mac-address uniqueness ......................................................................
engine: Consider case-sensitivity for mac-address uniqueness The patch modifies the check for MAC Address in use to be case-insensitive to avoid sending same mac address via rest with a different capitalization. Change-Id: I57516cc710648b37a9cebcdfce592c2418a7e192 Bug-Url: https://bugzilla.redhat.com/973911 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/18490/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java index 34518f6..99cfeb9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/MacPoolManager.java @@ -295,7 +295,23 @@ public boolean isMacInUse(String mac) { lockObj.readLock().lock(); try { - return allocatedMacs.containsKey(mac) || allocatedCustomMacs.containsKey(mac); + if (allocatedMacs.containsKey(mac) || allocatedCustomMacs.containsKey(mac)) { + return true; + } + + for (String macAddress : allocatedMacs.keySet()) { + if (StringUtils.equalsIgnoreCase(macAddress, mac)) { + return true; + } + } + + for (String macAddress : allocatedCustomMacs.keySet()) { + if (StringUtils.equalsIgnoreCase(macAddress, mac)) { + return true; + } + } + + return false; } finally { lockObj.readLock().unlock(); } -- To view, visit http://gerrit.ovirt.org/18490 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57516cc710648b37a9cebcdfce592c2418a7e192 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
