diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
index e501a0a..417d239 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java
@@ -99,7 +99,7 @@
         builder.set(SIGNAL_TYPE, signalType.toString());
 
         DefaultAnnotations annotations = builder.build();
-        long portSpeed = 0; // FIXME assign appropriate value
+        long portSpeed = signalType.bitRate();
         return new DefaultPortDescription(number, isEnabled, Port.Type.OCH, portSpeed, annotations);
     }
 
diff --git a/core/api/src/main/java/org/onosproject/net/OduSignalType.java b/core/api/src/main/java/org/onosproject/net/OduSignalType.java
index 6779d3e..fcc77cc 100644
--- a/core/api/src/main/java/org/onosproject/net/OduSignalType.java
+++ b/core/api/src/main/java/org/onosproject/net/OduSignalType.java
@@ -24,7 +24,7 @@
  * </p>
  */
 public enum OduSignalType {
-    /** bit rate in Mbps. */
+    // bit rate in Mbps
     ODU0(1_250),
     ODU1(2_500),
     ODU2(10_000),