commit 70e76d8bfdde7fa537e08d6aa8f570a7b6847fd5
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Tue Jan 05 16:26:26 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 07 19:06:06 2016 +0000
tree aa4fdf622f7d5288205bec3df509fc9f97b50ae9
parent 06909efd6e105e2d317d7c97a2319730610d5bca

Remove redundancy by replacing values with Spectrum.CENTER_FREQUENCY

Change-Id: I42836ca3884bb17304cd05be2b163a906421b5a6

web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java

diff --git a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
index 06c73d3..496f97d 100644
--- a/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/ConfigProvider.java
@@ -25,6 +25,7 @@
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
 import org.onlab.util.Frequency;
+import org.onlab.util.Spectrum;
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.ChannelSpacing;
 import org.onosproject.net.ConnectPoint;
@@ -100,7 +101,6 @@
 
     private static final String UNKNOWN = "unknown";
 
-    private static final Frequency CENTER = Frequency.ofTHz(193.1);
     // C-band has 4.4 THz (4,400 GHz) total bandwidth
     private static final Frequency TOTAL = Frequency.ofTHz(4.4);
 
@@ -256,7 +256,7 @@
                 // Currently, assume OMS when FIBER. Provide sane defaults.
                 annotations = annotations(node.get("annotations"));
                 return new OmsPortDescription(port, node.path("enabled").asBoolean(true),
-                                              CENTER, CENTER.add(TOTAL),
+                        Spectrum.CENTER_FREQUENCY, Spectrum.CENTER_FREQUENCY.add(TOTAL),
                                               Frequency.ofGHz(100), annotations);
             case ODUCLT:
                 annotations = annotations(node.get("annotations"));
@@ -391,8 +391,8 @@
         // if true, there was less channels than can be tightly packed.
         Frequency grid = chl.frequency();
         // say Linc's 1st slot starts at CENTER and goes up from there.
-        Frequency min = CENTER.add(grid);
-        Frequency max = CENTER.add(grid.multiply(numChls));
+        Frequency min = Spectrum.CENTER_FREQUENCY.add(grid);
+        Frequency max = Spectrum.CENTER_FREQUENCY.add(grid.multiply(numChls));
 
         PortDescription srcPortDesc = new OmsPortDescription(srcCp.port(), true, min, max, grid);
         PortDescription dstPortDesc = new OmsPortDescription(dstCp.port(), true, min, max, grid);