[ONOS] RSVP defect fix in master

Change-Id: I090d389f65a457cf5756ce73fe0c37468b46db5b

@@ -86,10 +86,9 @@ public class PceSetupPathCommand extends AbstractShellCommand {
         LspType lspType = LspType.values()[type];
         LspType lspType = LspType.values()[type];
 
 
         // Add bandwidth
         // 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) {
         if (bandwidth != 0.0) {
-            listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("MBPS")));
+            listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("BPS")));
         }
         }
 
 
         // Add cost
         // Add cost

@@ -515,7 +515,14 @@ public class PceManager implements PceService {
             }
             }
 
 
             if (existingBwValue != null) {
             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);
                 constraints.add(shBwConstraint);
             }
             }
         } else {
         } else {

@@ -72,7 +72,7 @@ public class PcepClientImpl implements PcepClientDriver {
     private byte deadTime;
     private byte deadTime;
     private byte sessionId;
     private byte sessionId;
     private PcepPacketStatsImpl pktStats;
     private PcepPacketStatsImpl pktStats;
-    private Map<LspKey, Boolean> lspDelegationInfo;
+    private Map<LspKey, Boolean> lspDelegationInfo = new HashMap<>();
     private Map<PccId, List<PcepStateReport>> syncRptCache = new HashMap<>();
     private Map<PccId, List<PcepStateReport>> syncRptCache = new HashMap<>();
 
 
     @Override
     @Override