| commit | dd3750cf0198b17299f15816c893379e79ccaeac | [log] [tgz] |
|---|---|---|
| author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Mon Feb 01 11:37:04 2016 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Tue Feb 09 20:32:50 2016 +0000 |
| tree | 7f5d25db47c9a8a344c5c3995d166ebc95fb25eb | |
| parent | 957390e21a9c8c03c80a1aa4128b9ae1c392450c [diff] [blame] |
Use ResourceId or DiscreteResourceId when specifying a resource Change-Id: I4e29558ec649510c8d08bb5e5f8ed10c189252e5
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalConnectivityIntentCompiler.java index 2f04cfd..5b741bc 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalConnectivityIntentCompiler.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalConnectivityIntentCompiler.java
@@ -214,8 +214,8 @@ private Set<OchSignal> findCommonLambdasOverLinks(List<Link> links) { return links.stream() .flatMap(x -> Stream.of( - Resources.discrete(x.src().deviceId(), x.src().port()).resource(), - Resources.discrete(x.dst().deviceId(), x.dst().port()).resource() + Resources.discrete(x.src().deviceId(), x.src().port()).id(), + Resources.discrete(x.dst().deviceId(), x.dst().port()).id() )) .map(resourceService::getAvailableResources) .map(x -> Iterables.filter(x, r -> r.last() instanceof OchSignal))