[CCSDK-245] RA: Refactor RA to make it generic

[ccsdk/sli/adaptors.git] / resource-assignment / provider / src / main / java / org / onap / ccsdk / sli / adaptors / util / speed / SpeedUtil.java

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java
index 1aad8f5..0d1359c 100644 (file)
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/util/speed/SpeedUtil.java
@@ -8,9 +8,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,12 +26,28 @@ public class SpeedUtil {
     private long unitFactor = 1000;
 
     public long convertToKbps(long maxSpeed, String unit) {
-        if (unit.equalsIgnoreCase("kbps"))
+        if (unit.equalsIgnoreCase("kbps")) {
             return maxSpeed;
-        if (unit.equalsIgnoreCase("Mbps"))
+        }
+        if (unit.equalsIgnoreCase("Mbps")) {
             return maxSpeed * unitFactor;
-        if (unit.equalsIgnoreCase("Gbps"))
+        }
+        if (unit.equalsIgnoreCase("Gbps")) {
             return maxSpeed * unitFactor * unitFactor;
+        }
+        return 0;
+    }
+
+    public long convertToMbps(long maxSpeed, String unit) {
+        if (unit.equalsIgnoreCase("kbps")) {
+            return maxSpeed / unitFactor;
+        }
+        if (unit.equalsIgnoreCase("Mbps")) {
+            return maxSpeed;
+        }
+        if (unit.equalsIgnoreCase("Gbps")) {
+            return maxSpeed * unitFactor;
+        }
         return 0;
     }