commit 70fb6c3e3ed4bd9c4863a58a6458c49cb9a31a86
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Feb 13 18:30:15 2017 -0800
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Tue Feb 14 13:43:42 2017 -0800
tree 9d4269d064d4dcbf199141c5370d326b01b08f87
parent 5b2f5c74308e7058285a713533ef843e2875fb6f

Assign OchPort speed based on ODU signal type

+ cosmetic fix

Change-Id: I6bf5b3417fabdf6c6233b8d945c0c15f47424f36

apps/optical-model/src/main/java/org/onosproject/net/optical/device/OchPortHelper.java

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);
     }
 

core/api/src/main/java/org/onosproject/net/OduSignalType.java

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 905f500..49203bc 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),