ONOS-7080 and ONOS-7070:
- added support for user-defined signal in add-optical-intent CLI
- implemented LambdaQuery behavior for restCiena driver
- added port based filtering of paths in OpticalIntentCompiler
Change-Id: Ibb61cc3722d5b3a52859d5585decf82a50ef5be0
diff --git a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaRestDevice.java b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaRestDevice.java
index 7627959..ebe362f 100644
--- a/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaRestDevice.java
+++ b/drivers/ciena/src/main/java/org/onosproject/drivers/ciena/CienaRestDevice.java
@@ -40,7 +40,6 @@
private static final String ENABLED = "enabled";
private static final String DISABLED = "disabled";
private static final Frequency BASE_FREQUENCY = Frequency.ofGHz(193_950);
- private static final int MULTIPLIER_OFFSET = 80;
//URIs
private static final String PORT_URI = "ws-ptps/ptps/%s";
@@ -74,10 +73,10 @@
}
- private String genFrequencyChangeRequest(long wavelength) {
+ private String genFrequencyChangeRequest(long frequency) {
String request = "{\n" +
"\"ciena-ws-ptp-modem:frequency\": {\n" +
- "\"value\": " + Long.toString(wavelength) + "\n" +
+ "\"value\": " + Long.toString(frequency) + "\n" +
"}\n" +
"}";
log.debug("request:\n{}", request);
@@ -123,7 +122,7 @@
public final boolean changeChannel(OchSignal signal, PortNumber outPort) {
String uri = genUri(CHANNEL_URI, outPort);
- int channel = signal.spacingMultiplier() + MULTIPLIER_OFFSET;
+ int channel = signal.spacingMultiplier();
log.debug("channel is {} for port {} on device {}", channel, outPort.name(), deviceId);
String request = genChannelChangeRequest(channel);
return putNoReply(uri, request);
@@ -135,10 +134,6 @@
return Double.valueOf(frequency).longValue();
}
- public static int getMultiplierOffset() {
- return MULTIPLIER_OFFSET;
- }
-
private int put(String uri, String request) {
InputStream payload = new ByteArrayInputStream(request.getBytes(StandardCharsets.UTF_8));
int response = controller.put(deviceId, uri, payload, MediaType.valueOf(MediaType.APPLICATION_JSON));