[ONOS-3730] Populate portSpeed for ODUCLT and OCH ports.
Also move the enum definition of ODU client port signal type outside of OduCltPort class.
Change-Id: Ibdff21d9707ad3d79587f579ad675f673cf9afeb
diff --git a/core/api/src/main/java/org/onosproject/net/OchPort.java b/core/api/src/main/java/org/onosproject/net/OchPort.java
index 8f1630b..c63b29d 100644
--- a/core/api/src/main/java/org/onosproject/net/OchPort.java
+++ b/core/api/src/main/java/org/onosproject/net/OchPort.java
@@ -44,8 +44,8 @@
*/
public OchPort(Element element, PortNumber number, boolean isEnabled, OduSignalType signalType,
boolean isTunable, OchSignal lambda, Annotations... annotations) {
- super(element, number, isEnabled, Type.OCH, 0, annotations);
- this.signalType = checkNotNull(signalType);
+ super(element, number, isEnabled, Type.OCH, checkNotNull(signalType).bitRate(), annotations);
+ this.signalType = signalType;
this.isTunable = isTunable;
this.lambda = checkNotNull(lambda);
}