[ONOS-4743] - DB sync is suspended if PCEP session is formed before BGP devices are learnt
Change-Id: I543201c54883e06182c1c83c4c64dd16a18e096c
diff --git a/providers/pcep/packet/src/main/java/org/onosproject/provider/pcep/packet/impl/PcepPacketProvider.java b/providers/pcep/packet/src/main/java/org/onosproject/provider/pcep/packet/impl/PcepPacketProvider.java
index 41cf375..5d4a042 100644
--- a/providers/pcep/packet/src/main/java/org/onosproject/provider/pcep/packet/impl/PcepPacketProvider.java
+++ b/providers/pcep/packet/src/main/java/org/onosproject/provider/pcep/packet/impl/PcepPacketProvider.java
@@ -12,9 +12,7 @@
import org.onlab.packet.IPv4;
import org.onlab.packet.MacAddress;
import org.onlab.packet.TCP;
-import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
@@ -96,22 +94,7 @@
// Get lsrId of the PCEP client from the PCC ID. Session info is based on lsrID.
String lsrId = String.valueOf(pccId.ipAddress());
- DeviceId pccDeviceId = null;
-
- // Find PCC deviceID from lsrId stored as annotations
- Iterable<Device> devices = deviceService.getAvailableDevices();
- for (Device dev : devices) {
- if ("L3".equals(dev.annotations().value(AnnotationKeys.TYPE))
- && lsrId.equals(dev.annotations().value(LSRID))) {
- pccDeviceId = dev.id();
- break;
- }
- }
-
- if (pccDeviceId == null) {
- log.error("Device not found to perform label DB sync.");
- return;
- }
+ DeviceId pccDeviceId = DeviceId.deviceId(lsrId);
InboundPacket inPkt = new DefaultInboundPacket(new ConnectPoint(pccDeviceId,
PortNumber.portNumber(PCEP_PORT)),