Add new OFOpticalSwitch13 LambdaQuery, and corrections to OMS port Desc:
- fix OmsPort totalChannels(),
- fix creating OMS PortDescription with correct parameters of min/max frequencies.
Change-Id: I9adbbb4e1e9ebe20ba4b3c2ae23b7a0651af5d66
diff --git a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
index 28b4afd..fe7f702 100644
--- a/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
+++ b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
@@ -123,7 +123,8 @@
//TODO consider renaming KBPS and MBPS (as they are used to convert by division)
private static final long KBPS = 1_000;
private static final long MBPS = 1_000 * 1_000;
- private static final Frequency FREQ100 = Frequency.ofGHz(100);
+ private static final Frequency FREQ50 = Frequency.ofGHz(50);
+ private static final Frequency FREQ191_7 = Frequency.ofGHz(191_700);
private static final Frequency FREQ4_4 = Frequency.ofGHz(4_400);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -598,7 +599,7 @@
switch (sigType) {
case OMSN:
portDes = new OmsPortDescription(portNo, enabled,
- Spectrum.CENTER_FREQUENCY, Spectrum.CENTER_FREQUENCY.add(FREQ4_4), FREQ100, annotations);
+ FREQ191_7, FREQ191_7.add(FREQ4_4), FREQ50, annotations);
break;
case OCH:
OFExpPortOpticalTransportLayerEntry entry = firstProp.getFeatures().get(0).getValue().get(0);