commit aa7e97333ad023b546673104091a6061b969c363
author Charles Chan <rascov@gmail.com> Fri Apr 06 17:03:23 2018 -0700
committer Charles Chan <charles@opennetworking.org> Sat Apr 07 01:46:32 2018 +0000
tree 3485b971123fa9387e581aaf4851cdbac1101925
parent f853a59d2e10db978a3b10b69ccb9942bd6a12fd

CORD-2917 Should not push packet requests that target specific device to all devices

Change-Id: I1ee4c39c358d7ae0ac6bb0ecdc3ea471f5082ac1

core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index 657ca48..6be6c54 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -131,7 +131,18 @@
         store.setDelegate(delegate);
         deviceService.addListener(deviceListener);
         defaultProvider.init(deviceService);
-        store.existingRequests().forEach(this::pushToAllDevices);
+        store.existingRequests().forEach(request -> {
+            if (request.deviceId().isPresent()) {
+                Device device = deviceService.getDevice(request.deviceId().get());
+                if (device != null) {
+                    pushRule(device, request);
+                } else {
+                    log.info("Device is not ready yet. Skip processing packet requests {}", request);
+                }
+            } else {
+                pushToAllDevices(request);
+            }
+        });
         log.info("Started");
     }