홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Avantika-Huawei
Committed by Gerrit Code Review
43446658 1 parent be4f6545

[ONOS-4687] GoldenEye - Label DB sync exception fix. 

Change-Id: I5a7a606675173d7446fbd779729931a033ac0c70
Inline Side-by-side
Showing 3 changed files with 5 additions and 1 deletions
...@@ -438,6 +438,7 @@ public class PcepClientControllerImpl implements PcepClientController { ...@@ -438,6 +438,7 @@ public class PcepClientControllerImpl implements PcepClientController {
438 // When there are no LSPs to sync, directly end-of-sync PCRpt will come and the 438 // When there are no LSPs to sync, directly end-of-sync PCRpt will come and the
439 // list will be null. 439 // list will be null.
440 syncStateRptList = Collections.EMPTY_LIST; 440 syncStateRptList = Collections.EMPTY_LIST;
441 + log.debug("No LSPs reported from PCC during sync.");
441 } 442 }
442 443
443 Iterator<PcepStateReport> stateRptListIterator = syncStateRptList.iterator(); 444 Iterator<PcepStateReport> stateRptListIterator = syncStateRptList.iterator();
......
...@@ -186,6 +186,7 @@ public class PcepClientImpl implements PcepClientDriver { ...@@ -186,6 +186,7 @@ public class PcepClientImpl implements PcepClientDriver {
186 186
187 @Override 187 @Override
188 public void setLspDbSyncStatus(PcepSyncStatus syncStatus) { 188 public void setLspDbSyncStatus(PcepSyncStatus syncStatus) {
189 + log.debug("LSP DB sync status set from {} to {}", this.lspDbSyncStatus, syncStatus);
189 this.lspDbSyncStatus = syncStatus; 190 this.lspDbSyncStatus = syncStatus;
190 } 191 }
191 192
...@@ -199,7 +200,7 @@ public class PcepClientImpl implements PcepClientDriver { ...@@ -199,7 +200,7 @@ public class PcepClientImpl implements PcepClientDriver {
199 200
200 PcepSyncStatus syncOldStatus = labelDbSyncStatus(); 201 PcepSyncStatus syncOldStatus = labelDbSyncStatus();
201 this.labelDbSyncStatus = syncStatus; 202 this.labelDbSyncStatus = syncStatus;
202 - 203 + log.debug("Label DB sync status set from {} to {}", syncOldStatus, syncStatus);
203 if ((syncOldStatus == PcepSyncStatus.IN_SYNC) && (syncStatus == PcepSyncStatus.SYNCED)) { 204 if ((syncOldStatus == PcepSyncStatus.IN_SYNC) && (syncStatus == PcepSyncStatus.SYNCED)) {
204 // Perform end of LSP DB sync actions. 205 // Perform end of LSP DB sync actions.
205 this.agent.analyzeSyncMsgList(pccId); 206 this.agent.analyzeSyncMsgList(pccId);
......
...@@ -10,6 +10,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality; ...@@ -10,6 +10,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
10 import org.apache.felix.scr.annotations.Service; 10 import org.apache.felix.scr.annotations.Service;
11 import org.onlab.packet.Ethernet; 11 import org.onlab.packet.Ethernet;
12 import org.onlab.packet.IPv4; 12 import org.onlab.packet.IPv4;
13 +import org.onlab.packet.MacAddress;
13 import org.onlab.packet.TCP; 14 import org.onlab.packet.TCP;
14 import org.onosproject.net.AnnotationKeys; 15 import org.onosproject.net.AnnotationKeys;
15 import org.onosproject.net.ConnectPoint; 16 import org.onosproject.net.ConnectPoint;
...@@ -90,6 +91,7 @@ public class PcepPacketProvider extends AbstractProvider implements PacketProvid ...@@ -90,6 +91,7 @@ public class PcepPacketProvider extends AbstractProvider implements PacketProvid
90 91
91 Ethernet eth = new Ethernet(); 92 Ethernet eth = new Ethernet();
92 eth.setEtherType(Ethernet.TYPE_IPV4); 93 eth.setEtherType(Ethernet.TYPE_IPV4);
94 + eth.setDestinationMACAddress(MacAddress.NONE);
93 eth.setPayload(ipv4); 95 eth.setPayload(ipv4);
94 96
95 // Get lsrId of the PCEP client from the PCC ID. Session info is based on lsrID. 97 // Get lsrId of the PCEP client from the PCC ID. Session info is based on lsrID.
......