Lambda queries don't rely on driver state, and have separate package.
Lambda query returns unsorted set.
fix for ONOS-3620
Change-Id: Ifffd03271f9c8c02be8897c3891c80148342757e
diff --git a/drivers/src/main/java/org/onosproject/driver/handshaker/CalientFiberSwitchHandshaker.java b/drivers/src/main/java/org/onosproject/driver/handshaker/CalientFiberSwitchHandshaker.java
index 8e40fd2..66aa8b7 100644
--- a/drivers/src/main/java/org/onosproject/driver/handshaker/CalientFiberSwitchHandshaker.java
+++ b/drivers/src/main/java/org/onosproject/driver/handshaker/CalientFiberSwitchHandshaker.java
@@ -17,14 +17,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import org.onlab.util.Spectrum;
-import org.onosproject.net.ChannelSpacing;
-import org.onosproject.net.DefaultOchSignalComparator;
import org.onosproject.net.Device;
-import org.onosproject.net.GridType;
-import org.onosproject.net.OchSignal;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.LambdaQuery;
import org.onosproject.openflow.controller.OpenFlowOpticalSwitch;
import org.onosproject.openflow.controller.PortDescPropertyType;
import org.onosproject.openflow.controller.driver.AbstractOpenFlowSwitch;
@@ -48,10 +41,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import java.util.SortedSet;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
/**
* Driver for Calient S160 Optical Circuit Switch. Untested on Calient S320 but probably works ok.
@@ -59,12 +49,9 @@
* Driver implements custom handshaker, and rewrites flow stats as expected by the device. Port stats are currently
* not supported.
*
- * The device consists of OMS ports only, and each port exposes lambda resources covering the whole
- * usable optical spectrum (U to O band, see {@link Spectrum} for spectrum definitions).
+ * The device consists of OMS ports only.
*/
-public class CalientFiberSwitchHandshaker
- extends AbstractOpenFlowSwitch
- implements OpenFlowOpticalSwitch, LambdaQuery {
+public class CalientFiberSwitchHandshaker extends AbstractOpenFlowSwitch implements OpenFlowOpticalSwitch {
private final AtomicBoolean driverHandshakeComplete = new AtomicBoolean(false);
private List<OFCalientPortDescStatsEntry> fiberPorts = new ArrayList<>();
@@ -198,20 +185,4 @@
super.sendMsg(newMsg);
}
-
- @Override
- public SortedSet<OchSignal> queryLambdas(PortNumber port) {
- // S160 data sheet
- // Wavelength range: 1260 - 1630 nm
- long startSpacingMultiplier = Spectrum.U_BAND_MIN.subtract(Spectrum.CENTER_FREQUENCY).asHz() /
- ChannelSpacing.CHL_12P5GHZ.frequency().asHz();
- long stopSpacingMultiplier = Spectrum.O_BAND_MAX.subtract(Spectrum.CENTER_FREQUENCY).asHz() /
- ChannelSpacing.CHL_12P5GHZ.frequency().asHz();
-
- // Only consider odd values for the multiplier (for easy mapping to fixed grid)
- return IntStream.rangeClosed((int) startSpacingMultiplier, (int) stopSpacingMultiplier)
- .filter(i -> i % 2 == 1)
- .mapToObj(i -> new OchSignal(GridType.FLEX, ChannelSpacing.CHL_6P25GHZ, i, 1))
- .collect(Collectors.toCollection(DefaultOchSignalComparator::newOchSignalTreeSet));
- }
}
diff --git a/drivers/src/main/java/org/onosproject/driver/handshaker/OfOpticalSwitchImplLinc13.java b/drivers/src/main/java/org/onosproject/driver/handshaker/OfOpticalSwitchImplLinc13.java
index 5f8c82f..8d5822c 100644
--- a/drivers/src/main/java/org/onosproject/driver/handshaker/OfOpticalSwitchImplLinc13.java
+++ b/drivers/src/main/java/org/onosproject/driver/handshaker/OfOpticalSwitchImplLinc13.java
@@ -16,13 +16,7 @@
package org.onosproject.driver.handshaker;
import com.google.common.collect.ImmutableSet;
-import org.onosproject.net.ChannelSpacing;
-import org.onosproject.net.DefaultOchSignalComparator;
import org.onosproject.net.Device;
-import org.onosproject.net.GridType;
-import org.onosproject.net.OchSignal;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.LambdaQuery;
import org.onosproject.openflow.controller.OpenFlowOpticalSwitch;
import org.onosproject.openflow.controller.PortDescPropertyType;
import org.onosproject.openflow.controller.driver.AbstractOpenFlowSwitch;
@@ -56,10 +50,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import java.util.SortedSet;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
/**
* LINC-OE Optical Emulator switch class.
@@ -72,14 +63,9 @@
*
* As LINC implements custom OF optical extensions (in contrast to the final standard as specified in
* ONF TS-022 (March 15, 2015), we need to rewrite flow stat requests and flow mods in {@link #sendMsg(OFMessage)}.
- *
- * LINC exposes OchSignal resources: 80 lambdas of 50 GHz (fixed grid) around ITU-T G.694.1 center frequency 193.1 GHz.
- *
*/
-public class OfOpticalSwitchImplLinc13
- extends AbstractOpenFlowSwitch implements OpenFlowOpticalSwitch, LambdaQuery {
+public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements OpenFlowOpticalSwitch {
- private static final int LAMBDA_COUNT = 80;
private final AtomicBoolean driverHandshakeComplete = new AtomicBoolean(false);
private long barrierXidToWaitFor = -1;
@@ -361,17 +347,4 @@
public Set<PortDescPropertyType> getPortTypes() {
return ImmutableSet.of(PortDescPropertyType.OPTICAL_TRANSPORT);
}
-
- @Override
- public SortedSet<OchSignal> queryLambdas(PortNumber port) {
- // OCh ports don't have lambdas
- if (isOChPort(port.toLong())) {
- return Collections.emptySortedSet();
- }
-
- // OMS ports expose 80 fixed grid lambdas of 50GHz width, centered around the ITU-T center frequency 193.1 THz.
- return IntStream.range(0, LAMBDA_COUNT)
- .mapToObj(x -> new OchSignal(GridType.DWDM, ChannelSpacing.CHL_50GHZ, x - (LAMBDA_COUNT / 2), 4))
- .collect(Collectors.toCollection(DefaultOchSignalComparator::newOchSignalTreeSet));
- }
}