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

Catch up with the latest API to fix the build error in #7156

Browse Source 
Change-Id: Ia51be04f9f5ed5381e524a405944bf3a67f0c034
This commit is contained in:
Sho SHIMIZU 2016-02-19 15:15:31 -08:00 committed by Gerrit Code Review
parent 1f53627d99
commit c4ae4d5896
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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