commit 0d0376176db4fb47486f5891cfb49ca3dd3812c4
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Oct 07 15:36:31 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Oct 13 17:46:23 2015 +0000
tree 64f2ef1c5cfcd579a6fb98719c0d2ca18f99aaec
parent cfe707af5e87f15bbda4c3d1aab204c755f425da

Avoid overlap of resource allocations

Change-Id: I7b1905ea694039909623fdc0bf3e505799cbdafa

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
index 11137aa..c332ada5 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
@@ -363,6 +363,15 @@
             after.add(allocations);
             linkAllocs.putIfAbsent(linkKey, after);
         } else {
+            boolean overlapped = before.stream()
+                    .flatMap(x -> x.getResourceAllocation(link).stream())
+                    .anyMatch(x -> allocations.getResourceAllocation(link).contains(x));
+            if (overlapped) {
+                throw new ResourceAllocationException(
+                        String.format("Resource allocations are overlapped between %s and %s",
+                        before, allocations)
+                );
+            }
             List<LinkResourceAllocations> after = new ArrayList<>(before.size() + 1);
             after.addAll(before);
             after.add(allocations);