commit 4c3cef015955d6037eaea9bab28c247ae9d0b14a
author Priyanka B <priyanka.b@huawei.com> Tue Jun 14 20:27:53 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 16 05:17:34 2016 +0000
tree 33f869a6c9da8e94f66c4f9111c151bb809b07e0
parent 25f1888414b53a49d60dc6bfff7713dbd3f6c450

[ONOS] RSVP defect fix in master

Change-Id: I090d389f65a457cf5756ce73fe0c37468b46db5b

apps/pce/app/src/main/java/org/onosproject/pce/cli/PceSetupPathCommand.java

diff --git a/apps/pce/app/src/main/java/org/onosproject/pce/cli/PceSetupPathCommand.java b/apps/pce/app/src/main/java/org/onosproject/pce/cli/PceSetupPathCommand.java
index d7e514b..a14e6e1 100644
--- a/apps/pce/app/src/main/java/org/onosproject/pce/cli/PceSetupPathCommand.java
+++ b/apps/pce/app/src/main/java/org/onosproject/pce/cli/PceSetupPathCommand.java
@@ -86,10 +86,9 @@
         LspType lspType = LspType.values()[type];
 
         // Add bandwidth
-        // bandwidth default data rate unit is in MBPS, since bandwidth value in network config
-        //stored in MPBS
+        // bandwidth default data rate unit is in BPS
         if (bandwidth != 0.0) {
-            listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("MBPS")));
+            listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("BPS")));
         }
 
         // Add cost

apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java

diff --git a/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java b/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
index 41e14dd..d4d4808 100644
--- a/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
+++ b/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
@@ -515,7 +515,14 @@
             }
 
             if (existingBwValue != null) {
-                shBwConstraint = new SharedBandwidthConstraint(links, existingBwValue, bwConstraint.bandwidth());
+                if (bwConstraintValue == 0) {
+                    bwConstraintValue = existingBwValue.bps();
+                }
+                //If bandwidth constraints not specified , take existing bandwidth for shared bandwidth calculation
+                shBwConstraint = bwConstraint != null ? new SharedBandwidthConstraint(links,
+                        existingBwValue, bwConstraint.bandwidth()) : new SharedBandwidthConstraint(links,
+                        existingBwValue, existingBwValue);
+
                 constraints.add(shBwConstraint);
             }
         } else {