Martin Mucha has uploaded a new change for review. Change subject: core: error fix: right bound of range interval should be inclusive. ......................................................................
core: error fix: right bound of range interval should be inclusive. number of macs in range was invalid, missing one mac, which causes system complaining about no available mac, when same start mac and end mac was used. This is not ok, since validations allows use of same start mac and end mac for given mac range. Change-Id: I236240df402d6d5a5d301043dd6314edc6f460e5 Bug-Url: https://bugzilla.redhat.com/1127245 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/RangeTest.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/31244/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java index b519576..3a7dea5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/Range.java @@ -20,7 +20,7 @@ this.rangeStart = rangeStart; this.rangeEnd = rangeEnd; - int numberOfMacs = (int) (rangeEnd - rangeStart); + int numberOfMacs = (int) (rangeEnd - rangeStart) + 1; this.availableMacsCount = numberOfMacs; this.usedMacs = new BitSet(numberOfMacs); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/RangeTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/RangeTest.java index 333d1cf..77eb526 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/RangeTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/RangeTest.java @@ -13,7 +13,7 @@ private static final int MAC_FROM_RANGE = 15; private static final int MAC_OUTSIDE_OF_RANGE = 25; private static final int RANGE_FROM = 10; - private static final int RANGE_TO = 20; + private static final int RANGE_TO = 19; private static final int NUMBER_OF_MACS = 10; private Range rangeOf10Macs; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java index d547cc6..e43863d 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java @@ -133,11 +133,11 @@ Collection<LongRange> ranges = parseRangeString(start + "-" + end); for (LongRange range : ranges) { - if (range.getMaximumLong() - range.getMinimumLong() > 0) { - return true; + if (range.getMaximumLong() - range.getMinimumLong() < 0) { + return false; } } - return false; + return true; } } -- To view, visit http://gerrit.ovirt.org/31244 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I236240df402d6d5a5d301043dd6314edc6f460e5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
