commit fe31dd4f1a82f8bb4333ee2da20a5c685bbeaa3b
author Hyunsun Moon <hyunsun.moon@gmail.com> Fri Sep 30 11:34:22 2016 -0700
committer Hyunsun Moon <hyunsun.moon@gmail.com> Wed Oct 19 18:40:33 2016 -0700
tree 2a64f20230d1168004e6f5a5c4760ba7309aa082
parent 5c14395ddd4284371220f0d6981d355a26fd2ba5

Remove a group not in use

Change-Id: I036be95df4241ed7dbe89a6319367571c3865386

src/main/java/org/opencord/cordvtn/impl/DependencyManager.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java b/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
index 08e67e9..3a36b53 100644
--- a/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/DependencyManager.java
@@ -39,6 +39,7 @@
 import org.onosproject.store.service.Serializer;
 import org.onosproject.store.service.StorageService;
 import org.opencord.cordvtn.api.CordVtnAdminService;
+import org.onosproject.store.service.Versioned;
 import org.opencord.cordvtn.api.CordVtnNode;
 import org.opencord.cordvtn.api.Dependency;
 import org.opencord.cordvtn.api.Dependency.Type;
@@ -73,6 +74,7 @@
 import org.opencord.cordvtn.impl.handler.AbstractInstanceHandler;
 import org.slf4j.Logger;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -243,6 +245,9 @@
     private void dependencyRemoved(Dependency dependency) {
         populateDependencyRules(dependency.subscriber(), dependency.provider(),
                                 dependency.type(), false);
+        if (getSubscribers(dependency.provider().id()).isEmpty()) {
+            removeProviderGroup(dependency.provider().id());
+        }
         log.info(String.format(MSG_REMOVE, dependency));
     }
 
@@ -465,6 +470,13 @@
         return groupId;
     }
 
+    private Set<Dependency> getSubscribers(NetworkId netId) {
+        return dependencyStore.values().stream().map(Versioned::value)
+                .flatMap(Collection::stream)
+                .filter(dependency -> dependency.provider().id().equals(netId))
+                .collect(Collectors.toSet());
+    }
+
     private void removeProviderGroup(NetworkId netId) {
         GroupKey groupKey = getGroupKey(netId);
         nodeManager.completeNodes().stream()
@@ -592,8 +604,6 @@
 
             newDeps.stream().filter(newDep -> !oldDeps.contains(newDep))
                     .forEach(DependencyManager.this::dependencyCreated);
-
-            // TODO remove any group if no subscriber exists
         }
     }
 }