Remove references to deprecated bandwidth method
Change-Id: I98f4f148d573bd7ce644733c33cc038b0b14dc97
diff --git a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
index 20dc9ae..2a1576f 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
@@ -34,16 +34,6 @@
}
/**
- * Creates a new {@link BandwidthResourceRequest} with bandwidth value.
- *
- * @param bandwidth bandwidth value to be requested
- */
- @Deprecated
- public BandwidthResourceRequest(double bandwidth) {
- this.bandwidth = Bandwidth.valueOf(bandwidth);
- }
-
- /**
* Returns the bandwidth resource.
*
* @return the bandwidth resource
diff --git a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
index bab3135..3cf3b24 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
@@ -130,12 +130,12 @@
/**
* Adds bandwidth request with bandwidth value.
*
- * @param bandwidth bandwidth value to be requested
+ * @param bandwidth bandwidth value in bits per second to be requested
* @return self
*/
@Override
public Builder addBandwidthRequest(double bandwidth) {
- resources.add(new BandwidthResourceRequest(bandwidth));
+ resources.add(new BandwidthResourceRequest(Bandwidth.bps(bandwidth)));
return this;
}
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 700df0e..f56632c 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
@@ -45,6 +45,7 @@
import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.criteria.Criterion.Type;
import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.resource.Bandwidth;
import org.onosproject.net.resource.BandwidthResourceRequest;
import org.onosproject.net.resource.LambdaResourceRequest;
import org.onosproject.net.resource.LinkResourceAllocations;
@@ -270,7 +271,8 @@
public Iterable<ResourceRequest> getAvailableResources(Link link) {
final List<ResourceRequest> result = new LinkedList<>();
if (availableBandwidth > 0.0) {
- result.add(new BandwidthResourceRequest(availableBandwidth));
+ result.add(new BandwidthResourceRequest(
+ Bandwidth.bps(availableBandwidth)));
}
if (availableLambda > 0) {
result.add(new LambdaResourceRequest());