commit 0c59de0f778158ee650a93f98b3c15a598891213
author Rimon Ashkenazy <rimon8963@gmail.com> Mon Mar 21 13:23:26 2016 +0200
committer Gerrit Code Review <gerrit@onlab.us> Mon Mar 21 21:39:36 2016 +0000
tree 7e255d66b1f4d5c0fcac10830f9240f1e23e1d3e
parent 5df1447e7f71d51d383f5704add57883e41a7b5d

OpticalCircuitIntentCompiler - fix resource allocation failure (bug ONOS-4184)

Change-Id: I0e86bd8d309423ea835a4fa1988dc0971b84ef02

core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
index 87db178..aa8698c 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
@@ -16,6 +16,7 @@
 package org.onosproject.net.intent.impl.compiler;
 
 import com.google.common.base.Strings;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -78,6 +79,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -184,21 +186,19 @@
         // TODO: try to release intent resources in IntentManager.
         resourceService.release(intent.id());
 
-        // Reserve OduClt ports
+        // Check OduClt ports availability
         Resource srcPortResource = Resources.discrete(src.deviceId(), src.port()).resource();
         Resource dstPortResource = Resources.discrete(dst.deviceId(), dst.port()).resource();
-        List<ResourceAllocation> allocation = resourceService.allocate(intent.id(), srcPortResource, dstPortResource);
-        if (allocation.isEmpty()) {
-            throw new IntentCompilationException("Unable to reserve ports for intent " + intent);
+        // If ports are not available, compilation fails
+        if (!Stream.of(srcPortResource, dstPortResource).allMatch(resourceService::isAvailable)) {
+            throw new IntentCompilationException("Ports for the intent are not available. Intent: " + intent);
         }
+        List<Resource> ports = ImmutableList.of(srcPortResource, dstPortResource);
 
         // Check if both devices support multiplexing (usage of TributarySlots)
         boolean multiplexingSupported = isMultiplexingSupported(intent.getSrc())
                 && isMultiplexingSupported(intent.getDst());
 
-        // slots are used only for devices supporting multiplexing
-        List<Resource> ports = ImmutableList.of(srcPortResource, dstPortResource);
-
         OpticalConnectivityIntent connIntent = findOpticalConnectivityIntent(intent.getSrc(), intent.getDst(),
                 intent.getSignalType(), multiplexingSupported);