commit f4363a077a4ed01355cb00f541752f7f07a97e4c
author Carmelo Cascone <carmelo@onlab.us> Thu Jun 02 09:45:47 2016 -0700
committer Carmelo Cascone <carmelo@onlab.us> Mon Jun 13 16:15:22 2016 +0000
tree f730c10b92b4f02e64b0e188efc2829246bbd0d7
parent 91ba41a2881c6f936fb857db6ee87bf5b2f8fbc0

Added device listener to fallback flow rule provider to trigger flow
entries probe after device events

Helpful for devices that do not provide configuration persistency,
to quickly restore flow rules after a reboot or an update.

Change-Id: I35dee1ff56076ddda7d22c353a01d518f2f88eed
(cherry picked from commit 0969e6f2dad233980a49b5884e22286be0736b72)

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleDriverProvider.java

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleDriverProvider.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleDriverProvider.java
index 262f2f6..d2cdf9d 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleDriverProvider.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleDriverProvider.java
@@ -24,6 +24,8 @@
 import org.onosproject.mastership.MastershipService;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.flow.CompletedBatchOperation;
 import org.onosproject.net.flow.FlowRule;
@@ -45,6 +47,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static com.google.common.collect.ImmutableSet.copyOf;
+import static org.onosproject.net.device.DeviceEvent.Type.*;
 import static org.onosproject.net.flow.FlowRuleBatchEntry.FlowRuleOperation.*;
 
 /**
@@ -62,6 +65,7 @@
     private DeviceService deviceService;
     private MastershipService mastershipService;
 
+    private InternalDeviceListener deviceListener = new InternalDeviceListener();
     private ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
     private ScheduledFuture<?> poller = null;
 
@@ -87,6 +91,8 @@
         this.deviceService = deviceService;
         this.mastershipService = mastershipService;
 
+        deviceService.addListener(deviceListener);
+
         if (poller != null && !poller.isCancelled()) {
             poller.cancel(false);
         }
@@ -164,14 +170,33 @@
         }
     }
 
+    private void pollDeviceFlowEntries(Device device) {
+        providerService.pushFlowMetrics(device.id(), device.as(FlowRuleProgrammable.class).getFlowEntries());
+    }
 
     private void pollFlowEntries() {
         deviceService.getAvailableDevices().forEach(device -> {
             if (mastershipService.isLocalMaster(device.id()) && device.is(FlowRuleProgrammable.class)) {
-                providerService.pushFlowMetrics(device.id(),
-                                                device.as(FlowRuleProgrammable.class).getFlowEntries());
+                pollDeviceFlowEntries(device);
             }
         });
     }
 
+    private class InternalDeviceListener implements DeviceListener {
+
+        @Override
+        public void event(DeviceEvent event) {
+            executor.schedule(() -> pollDeviceFlowEntries(event.subject()), 0, TimeUnit.SECONDS);
+        }
+
+        @Override
+        public boolean isRelevant(DeviceEvent event) {
+            Device device = event.subject();
+            return mastershipService.isLocalMaster(device.id()) && device.is(FlowRuleProgrammable.class) &&
+                    (event.type() == DEVICE_ADDED ||
+                            event.type() == DEVICE_UPDATED ||
+                            (event.type() == DEVICE_AVAILABILITY_CHANGED && deviceService.isAvailable(device.id())));
+        }
+    }
+
 }