commit c56cded49f74a5cf62c8ffaf5b40d855326fdc2b
author Kavitha Alagesan <kalagesa@partner.ciena.com> Fri Jan 13 10:48:18 2017 +0530
committer Thomas Vachuska <tom@onlab.us> Thu May 04 17:29:41 2017 +0000
tree 0eb776a73778bfa1af8cef597e7ac4cf1789ac50
parent 0a71c8beac24f7c0989125db3640b82af120a8fd

ONOS-3701

Change-Id: If690f7c46f224625bf7a84fa12305d9a02a65571

core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 61c70ba..f9a53ec 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -110,6 +110,7 @@
 
     private static final boolean GARBAGE_COLLECT = false;
     private static final int GC_THRESH = 6;
+    private static final boolean ALLOW_EXTRANEOUS_GROUPS = true;
 
     private final int dummyId = 0xffffffff;
     private final GroupId dummyGroupId = new GroupId(dummyId);
@@ -161,6 +162,9 @@
             label = "Number of rounds for group garbage collection")
     private int gcThresh = GC_THRESH;
 
+    @Property(name = "allowExtraneousGroups", boolValue = ALLOW_EXTRANEOUS_GROUPS,
+            label = "Allow groups in switches not installed by ONOS")
+    private boolean allowExtraneousGroups = ALLOW_EXTRANEOUS_GROUPS;
 
     @Activate
     public void activate() {
@@ -252,9 +256,13 @@
 
             s = get(properties, "gcThresh");
             gcThresh = isNullOrEmpty(s) ? GC_THRESH : Integer.parseInt(s.trim());
+
+            s = get(properties, "allowExtraneousGroups");
+            allowExtraneousGroups = isNullOrEmpty(s) ? ALLOW_EXTRANEOUS_GROUPS : Boolean.parseBoolean(s.trim());
         } catch (Exception e) {
             gcThresh = GC_THRESH;
             garbageCollect = GARBAGE_COLLECT;
+            allowExtraneousGroups = ALLOW_EXTRANEOUS_GROUPS;
         }
     }
 
@@ -1367,7 +1375,11 @@
                 log.debug("Group AUDIT: extraneous group {} exists in data plane for device {}",
                           group.id(), deviceId);
                 extraneousStoredEntries.remove(group);
-                extraneousGroup(group);
+                if (allowExtraneousGroups) {
+                    extraneousGroup(group);
+                } else {
+                    notifyDelegate(new GroupEvent(Type.GROUP_REMOVE_REQUESTED, group));
+                }
             }
         }
         for (Group group : storedGroupEntries) {