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/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java

diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
index 279a8bb..37bea8d 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
@@ -35,7 +35,7 @@
 import org.onosproject.net.flow.criteria.Criterion.Type;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.BandwidthResource;
 import org.onosproject.net.resource.BandwidthResourceRequest;
 import org.onosproject.net.resource.LambdaResource;
 import org.onosproject.net.resource.LambdaResourceAllocation;
@@ -302,7 +302,7 @@
             final List<ResourceRequest> result = new LinkedList<>();
             if (availableBandwidth > 0.0) {
                 result.add(new BandwidthResourceRequest(
-                        Bandwidth.bps(availableBandwidth)));
+                        BandwidthResource.bps(availableBandwidth)));
             }
             if (availableLambda > 0) {
                 result.add(new LambdaResourceRequest());

core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
index 4e549ea..5505e13 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
@@ -17,7 +17,7 @@
 
 import org.junit.Test;
 import org.onosproject.net.Link;
-import org.onosproject.net.resource.Bandwidth;
+import org.onosproject.net.resource.BandwidthResource;
 import org.onosproject.net.resource.LambdaResource;
 
 import com.google.common.testing.EqualsTester;
@@ -35,11 +35,11 @@
     // Bandwidth Constraint
 
     final BandwidthConstraint bandwidthConstraint1 =
-            new BandwidthConstraint(Bandwidth.bps(100.0));
+            new BandwidthConstraint(BandwidthResource.bps(100.0));
     final BandwidthConstraint bandwidthConstraintSameAs1 =
-            new BandwidthConstraint(Bandwidth.bps(100.0));
+            new BandwidthConstraint(BandwidthResource.bps(100.0));
     final BandwidthConstraint bandwidthConstraint2 =
-            new BandwidthConstraint(Bandwidth.bps(200.0));
+            new BandwidthConstraint(BandwidthResource.bps(200.0));
 
     /**
      * Checks that the objects were created properly.