CORD-394 Purge group/flow store when device goes offline
Stage 1: (this commit)
Add a component config purgeOnDisconnection, which is false by default.
When set to true, GroupManager and FlowManager will purge groups/flows
associated with a device when the device goes offline.
Stage 2: (upcoming commit)
Enable these configs in SegmentRoutingManager
Clean up group related information in SegmentRountingManager
Change-Id: I46d047d690d4641e030f6cdd084ce16ac02d8919
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
index 33f1cc5..e80d175 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleFlowRuleStore.java
@@ -274,6 +274,10 @@
return null;
}
+ public void purgeFlowRule(DeviceId deviceId) {
+ flowEntries.remove(deviceId);
+ }
+
@Override
public void storeBatch(
FlowRuleBatchOperation operation) {
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
index 230fa33..d3ab890 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStore.java
@@ -23,6 +23,8 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -477,6 +479,19 @@
}
@Override
+ public void purgeGroupEntry(DeviceId deviceId) {
+ Set<Map.Entry<GroupId, StoredGroupEntry>> entryPendingRemove =
+ groupEntriesById.get(deviceId).entrySet();
+
+ groupEntriesById.remove(deviceId);
+ groupEntriesByKey.remove(deviceId);
+
+ entryPendingRemove.forEach(entry -> {
+ notifyDelegate(new GroupEvent(Type.GROUP_REMOVED, entry.getValue()));
+ });
+ }
+
+ @Override
public void deviceInitialAuditCompleted(DeviceId deviceId,
boolean completed) {
synchronized (deviceAuditStatus) {
diff --git a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
index b10fca5..15eb9bc 100644
--- a/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
+++ b/core/common/src/test/java/org/onosproject/store/trivial/SimpleGroupStoreTest.java
@@ -16,6 +16,8 @@
package org.onosproject.store.trivial;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.is;
import static org.onosproject.net.DeviceId.deviceId;
import java.util.ArrayList;
@@ -199,6 +201,11 @@
// Testing removeGroupEntry operation from southbound
testRemoveGroupFromSB(currKey);
+
+ // Testing removing all groups on the given device
+ newKey = new DefaultGroupKey("group1".getBytes());
+ testStoreAndGetGroup(newKey);
+ testDeleteGroupOnDevice(newKey);
}
// Testing storeGroup operation
@@ -376,6 +383,13 @@
simpleGroupStore.unsetDelegate(deleteGroupDescDelegate);
}
+ // Testing deleteGroupDescription operation from northbound
+ private void testDeleteGroupOnDevice(GroupKey currKey) {
+ assertThat(simpleGroupStore.getGroupCount(D1), is(1));
+ simpleGroupStore.purgeGroupEntry(D1);
+ assertThat(simpleGroupStore.getGroupCount(D1), is(0));
+ }
+
// Testing removeGroupEntry operation from southbound
private void testRemoveGroupFromSB(GroupKey currKey) {
Group existingGroup = simpleGroupStore.getGroup(D1, currKey);