홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Priyanka B
Committed by Gerrit Code Review
55c2fde3 1 parent 37900724

[ONOS] CR case defect fix 

Change-Id: I2a182b75d143410cc900e1b2bc9d268c22070eac
Inline Side-by-side
Showing 2 changed files with 19 additions and 1 deletions
...@@ -150,7 +150,7 @@ public final class BasicPceccHandler { ...@@ -150,7 +150,7 @@ public final class BasicPceccHandler {
150 150
151 // Push into destination device 151 // Push into destination device
152 // Destination device IN port is link.dst().port() 152 // Destination device IN port is link.dst().port()
153 - installLocalLabelRule(dstDeviceId, labelId, dstPort, tunnel.tunnelId(), isLastLabelToPush, 153 + installLocalLabelRule(dstDeviceId, labelId, dstPort, tunnel.tunnelId(), false,
154 Long.valueOf(LabelType.IN_LABEL.value), Objective.Operation.ADD); 154 Long.valueOf(LabelType.IN_LABEL.value), Objective.Operation.ADD);
155 155
156 // Push into source device 156 // Push into source device
......
...@@ -142,11 +142,14 @@ import org.onosproject.pcepio.types.PcepLabelDownload; ...@@ -142,11 +142,14 @@ import org.onosproject.pcepio.types.PcepLabelDownload;
142 import org.onosproject.pcepio.types.PcepLabelMap; 142 import org.onosproject.pcepio.types.PcepLabelMap;
143 import org.onosproject.pcepio.types.PcepValueType; 143 import org.onosproject.pcepio.types.PcepValueType;
144 import org.onosproject.pcepio.types.StatefulIPv4LspIdentifiersTlv; 144 import org.onosproject.pcepio.types.StatefulIPv4LspIdentifiersTlv;
145 +import org.onosproject.pcepio.protocol.PcepAttribute;
146 +import org.onosproject.pcepio.protocol.PcepBandwidthObject;
145 import org.onosproject.pcep.controller.SrpIdGenerators; 147 import org.onosproject.pcep.controller.SrpIdGenerators;
146 import org.onosproject.pcep.controller.PcepAnnotationKeys; 148 import org.onosproject.pcep.controller.PcepAnnotationKeys;
147 import org.osgi.service.component.ComponentContext; 149 import org.osgi.service.component.ComponentContext;
148 import org.slf4j.Logger; 150 import org.slf4j.Logger;
149 151
152 +import static org.onosproject.pcep.controller.PcepAnnotationKeys.BANDWIDTH;
150 import static org.onosproject.pcep.controller.PcepSyncStatus.IN_SYNC; 153 import static org.onosproject.pcep.controller.PcepSyncStatus.IN_SYNC;
151 import static org.onosproject.pcep.controller.PcepSyncStatus.SYNCED; 154 import static org.onosproject.pcep.controller.PcepSyncStatus.SYNCED;
152 import static org.onosproject.net.flow.criteria.Criterion.Type.EXTENSION; 155 import static org.onosproject.net.flow.criteria.Criterion.Type.EXTENSION;
...@@ -561,8 +564,23 @@ public class BgpcepFlowRuleProvider extends AbstractProvider ...@@ -561,8 +564,23 @@ public class BgpcepFlowRuleProvider extends AbstractProvider
561 .setSubObjects(subObjects) 564 .setSubObjects(subObjects)
562 .build(); 565 .build();
563 566
567 + float iBandwidth = 0;
568 + if (tunnel.annotations().value(BANDWIDTH) != null) {
569 + //iBandwidth = Float.floatToIntBits(Float.parseFloat(tunnel.annotations().value(BANDWIDTH)));
570 + iBandwidth = Float.parseFloat(tunnel.annotations().value(BANDWIDTH));
571 + }
572 + // build bandwidth object
573 + PcepBandwidthObject bandwidthObject = pc.factory().buildBandwidthObject()
574 + .setBandwidth(iBandwidth)
575 + .build();
576 + // build pcep attribute
577 + PcepAttribute pcepAttribute = pc.factory().buildPcepAttribute()
578 + .setBandwidthObject(bandwidthObject)
579 + .build();
580 +
564 PcepMsgPath msgPath = pc.factory().buildPcepMsgPath() 581 PcepMsgPath msgPath = pc.factory().buildPcepMsgPath()
565 .setEroObject(eroObj) 582 .setEroObject(eroObj)
583 + .setPcepAttribute(pcepAttribute)
566 .build(); 584 .build();
567 585
568 PcepUpdateRequest updateReq = pc.factory().buildPcepUpdateRequest() 586 PcepUpdateRequest updateReq = pc.factory().buildPcepUpdateRequest()
......