mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 05:11:04 +02:00
Code Issues Projects Releases Wiki Activity

Fixing broken build; breaking OpticalCircuitIntentCompiler in the process though.

Browse Source 
Change-Id: Ice66be4bb23b90d2466ba1d029f29b5d7df0cfa4
This commit is contained in:
Thomas Vachuska 2016-02-19 12:54:31 -08:00
parent 27728f20f5
commit 762c1bb971
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
*/ */
package org.onosproject.net.intent.impl.compiler; package org.onosproject.net.intent.impl.compiler;
import com.google.common.collect.ImmutableSet;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;
@ -643,10 +644,12 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
* @return set of TributarySlots available on the connect point * @return set of TributarySlots available on the connect point
*/ */
Set<TributarySlot> findTributarySlotsOnCp(ConnectPoint cp) { Set<TributarySlot> findTributarySlotsOnCp(ConnectPoint cp) {
return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id()) return ImmutableSet.of(); // temporary fix for build
.stream() // FIXME: below changes break the build due to conflicting changes on Resource, which obsoleted Resource#last()
.filter(x -> x.last() instanceof TributarySlot) // return resourceService.getAvailableResources(Resources.discrete(cp.deviceId(), cp.port()).id())
.map(x -> (TributarySlot) x.last()) // .stream()
.collect(Collectors.toSet()); // .filter(x -> x.last() instanceof TributarySlot)
// .map(x -> (TributarySlot) x.last())
// .collect(Collectors.toSet());
} }
} }