Populate Bandwidth with BandwidthResource

Change-Id: I7412c0c8141a8e22c2b157ee81989a79939c2299

@@ -15,27 +15,31 @@
  */
  */
 package org.onosproject.net.resource;
 package org.onosproject.net.resource;
 
 
+import org.onlab.util.Bandwidth;
+
 import java.util.Objects;
 import java.util.Objects;
 
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
 /**
  * Representation of bandwidth resource in bps.
  * Representation of bandwidth resource in bps.
  */
  */
 public final class BandwidthResource extends LinkResource {
 public final class BandwidthResource extends LinkResource {
 
 
-    private final double bandwidth;
+    private final Bandwidth bandwidth;
 
 
     /**
     /**
      * Creates a new instance with given bandwidth.
      * Creates a new instance with given bandwidth.
      *
      *
      * @param bandwidth bandwidth value to be assigned
      * @param bandwidth bandwidth value to be assigned
      */
      */
-    private BandwidthResource(double bandwidth) {
-        this.bandwidth = bandwidth;
+    private BandwidthResource(Bandwidth bandwidth) {
+        this.bandwidth = checkNotNull(bandwidth);
     }
     }
 
 
     // Constructor for serialization
     // Constructor for serialization
     private BandwidthResource() {
     private BandwidthResource() {
-        this.bandwidth = 0;
+        this.bandwidth = null;
     }
     }
 
 
     /**
     /**
@@ -49,6 +53,10 @@ public final class BandwidthResource extends LinkResource {
         return bps(bandwidth);
         return bps(bandwidth);
     }
     }
 
 
+    public static BandwidthResource from(Bandwidth bandwidth) {
+        return new BandwidthResource(bandwidth);
+    }
+
     /**
     /**
      * Creates a new instance with given bandwidth in bps.
      * Creates a new instance with given bandwidth in bps.
      *
      *
@@ -56,7 +64,7 @@ public final class BandwidthResource extends LinkResource {
      * @return {@link BandwidthResource} instance with given bandwidth
      * @return {@link BandwidthResource} instance with given bandwidth
      */
      */
     public static BandwidthResource bps(double bps) {
     public static BandwidthResource bps(double bps) {
-        return new BandwidthResource(bps);
+        return from(Bandwidth.bps(bps));
     }
     }
 
 
     /**
     /**
@@ -66,7 +74,7 @@ public final class BandwidthResource extends LinkResource {
      * @return {@link BandwidthResource} instance with given bandwidth
      * @return {@link BandwidthResource} instance with given bandwidth
      */
      */
     public static BandwidthResource kbps(double kbps) {
     public static BandwidthResource kbps(double kbps) {
-        return new BandwidthResource(kbps * 1_000L);
+        return from(Bandwidth.kbps(kbps));
     }
     }
 
 
     /**
     /**
@@ -76,7 +84,7 @@ public final class BandwidthResource extends LinkResource {
      * @return {@link BandwidthResource} instance with given bandwidth
      * @return {@link BandwidthResource} instance with given bandwidth
      */
      */
     public static BandwidthResource mbps(double mbps) {
     public static BandwidthResource mbps(double mbps) {
-        return new BandwidthResource(mbps * 1_000_000L);
+        return from(Bandwidth.mbps(mbps));
     }
     }
 
 
     /**
     /**
@@ -86,7 +94,7 @@ public final class BandwidthResource extends LinkResource {
      * @return {@link BandwidthResource} instance with given bandwidth
      * @return {@link BandwidthResource} instance with given bandwidth
      */
      */
     public static BandwidthResource gbps(double gbps) {
     public static BandwidthResource gbps(double gbps) {
-        return new BandwidthResource(gbps * 1_000_000_000L);
+        return from(Bandwidth.gbps(gbps));
     }
     }
 
 
     /**
     /**
@@ -95,7 +103,7 @@ public final class BandwidthResource extends LinkResource {
      * @return bandwidth as a double value
      * @return bandwidth as a double value
      */
      */
     public double toDouble() {
     public double toDouble() {
-        return bandwidth;
+        return bandwidth.bps();
     }
     }
 
 
     @Override
     @Override