commit 62ad75ef4682436b567fa1484f717a7d8335c715
author Saurav Das <sauravdas@alumni.stanford.edu> Tue Mar 05 12:22:22 2019 -0800
committer Saurav Das <sauravdas@alumni.stanford.edu> Wed Mar 06 18:54:09 2019 -0800
tree eff4e66d365c8add37a00c93c96c1fb260503b8c
parent 838d81474f1a1ebb039e08be89ee2cb441630c57

SEBA-385: Ensure that flow-store is flushed when device disconnects.

Avoids problems when voltha reconnects and flows are pushed too soon,
or stale flows are pushed because port numbers have changed.

Change-Id: Id9e3baed71ff39a966782f9a22917f3b36b8f998

app/src/main/java/org/opencord/olt/impl/Olt.java

diff --git a/app/src/main/java/org/opencord/olt/impl/Olt.java b/app/src/main/java/org/opencord/olt/impl/Olt.java
index 4deb672..a3c40a8 100644
--- a/app/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/app/src/main/java/org/opencord/olt/impl/Olt.java
@@ -23,10 +23,11 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.util.AbstractMap;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Dictionary;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -77,19 +78,19 @@
 import org.onosproject.net.flowobjective.Objective;
 import org.onosproject.net.flowobjective.ObjectiveContext;
 import org.onosproject.net.flowobjective.ObjectiveError;
-import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.service.ConsistentMultimap;
-import org.onosproject.store.service.Serializer;
-import org.onosproject.store.service.StorageService;
 import org.onosproject.net.meter.Band;
 import org.onosproject.net.meter.DefaultBand;
 import org.onosproject.net.meter.DefaultMeterRequest;
 import org.onosproject.net.meter.Meter;
-import org.onosproject.net.meter.MeterService;
+import org.onosproject.net.meter.MeterEvent;
+import org.onosproject.net.meter.MeterId;
 import org.onosproject.net.meter.MeterListener;
 import org.onosproject.net.meter.MeterRequest;
-import org.onosproject.net.meter.MeterId;
-import org.onosproject.net.meter.MeterEvent;
+import org.onosproject.net.meter.MeterService;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.service.ConsistentMultimap;
+import org.onosproject.store.service.Serializer;
+import org.onosproject.store.service.StorageService;
 import org.opencord.olt.AccessDeviceEvent;
 import org.opencord.olt.AccessDeviceListener;
 import org.opencord.olt.AccessDeviceService;
@@ -101,8 +102,6 @@
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 
-import java.util.HashMap;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 
@@ -209,9 +208,16 @@
         eventExecutor = newSingleThreadScheduledExecutor(groupedThreads("onos/olt", "events-%d", log));
         modified(context);
         appId = coreService.registerApplication(APP_NAME);
+
+        // ensure that flow rules are purged from flow-store upon olt-disconnection
+        // when olt reconnects, the port-numbers may change for the ONUs
+        // making flows pushed earlier invalid
+        componentConfigService
+                .preSetProperty("org.onosproject.net.flow.impl.FlowRuleManager",
+                                "purgeOnDisconnection", "true");
         componentConfigService.registerProperties(getClass());
         programmedSubs = Maps.newConcurrentMap();
-        programmedMeters = new CopyOnWriteArrayList();
+        programmedMeters = new CopyOnWriteArrayList<>();
 
         eventDispatcher.addSink(AccessDeviceEvent.class, listenerRegistry);