commit 63feca7d268441465d9125468e21dea23854e1f6
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu May 07 10:44:25 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 08 23:08:36 2015 +0000
tree 0fb73aa54a11f5bac1c84213ddcb2df8fd0ff9eb
parent 816977987d1236fa66a197185f766a6e3a47c71c

Rename Bandwidth to BandwidthResource

To distinguish unit of bandwidth and resource of bandwidth

Change-Id: Ice52538f0c00f6d7743ca247d0f9bab3febdc94b

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
index 660440c..62d9d02 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentLinkResourceStore.java
@@ -23,7 +23,7 @@
 import org.onosproject.net.LinkKey;
 import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.link.LinkService;
-import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.BandwidthResource;
 import org.onosproject.net.resource.BandwidthResourceAllocation;
 import org.onosproject.net.resource.LambdaResource;
 import org.onosproject.net.resource.LambdaResourceAllocation;
@@ -67,8 +67,8 @@
 
     private final Logger log = getLogger(getClass());
 
-    private static final Bandwidth DEFAULT_BANDWIDTH = Bandwidth.mbps(1_000);
-    private static final Bandwidth EMPTY_BW = Bandwidth.bps(0);
+    private static final BandwidthResource DEFAULT_BANDWIDTH = BandwidthResource.mbps(1_000);
+    private static final BandwidthResource EMPTY_BW = BandwidthResource.bps(0);
 
     // Smallest non-reserved MPLS label
     private static final int MIN_UNRESERVED_LABEL = 0x10;
@@ -150,11 +150,11 @@
 
         // if Link annotation exist, use them
         // if all fails, use DEFAULT_BANDWIDTH
-        Bandwidth bandwidth = null;
+        BandwidthResource bandwidth = null;
         String strBw = link.annotations().value(BANDWIDTH);
         if (strBw != null) {
             try {
-                bandwidth = Bandwidth.mbps(Double.parseDouble(strBw));
+                bandwidth = BandwidthResource.mbps(Double.parseDouble(strBw));
             } catch (NumberFormatException e) {
                 // do nothings
                 bandwidth = null;
@@ -237,7 +237,7 @@
                         }
                     }
 
-                    free.put(type, Sets.newHashSet(new BandwidthResourceAllocation(Bandwidth.bps(freeBw))));
+                    free.put(type, Sets.newHashSet(new BandwidthResourceAllocation(BandwidthResource.bps(freeBw))));
                     break;
                 case LAMBDA:
                     Set<? extends ResourceAllocation> lmd = caps.get(type);