commit c1ce95431a6cad62587cdc323d2c7cc5c3ad7cf8
author Naoki Shiota <n-shiota@onlab.us> Tue Mar 08 14:10:23 2016 -0800
committer HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Sat Apr 16 18:15:50 2016 -0700
tree de2174ce2e1e3bb256d89ac45933416b84e980e5
parent 16b7abf1dc8e5f16d9fd95d97c07b3516ed18e8f

Fixed the timing of PATH_REMOVED event.

Change-Id: I6168d87a364c945e6954faaa5edaf7a8aa2e1249

ecord/metro/src/main/java/org/onosproject/ecord/metro/MetroPathProvisioner.java

diff --git a/ecord/metro/src/main/java/org/onosproject/ecord/metro/MetroPathProvisioner.java b/ecord/metro/src/main/java/org/onosproject/ecord/metro/MetroPathProvisioner.java
index 7fa0092..d50152d 100644
--- a/ecord/metro/src/main/java/org/onosproject/ecord/metro/MetroPathProvisioner.java
+++ b/ecord/metro/src/main/java/org/onosproject/ecord/metro/MetroPathProvisioner.java
@@ -62,6 +62,8 @@
 import org.onosproject.net.intent.OpticalCircuitIntent;
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.PointToPointIntent;
+import org.onosproject.net.link.LinkEvent;
+import org.onosproject.net.link.LinkListener;
 import org.onosproject.net.link.LinkService;
 import org.onosproject.net.resource.BandwidthCapacity;
 import org.onosproject.net.resource.ContinuousResource;
@@ -151,6 +153,7 @@
 
     private AtomicCounter idCounter;
 
+    private LinkListener linkListener = new InternalLinkListener();
     private IntentListener intentListener = new InternalIntentListener();
     private NetworkConfigListener netcfgListener = new InternalNetworkConfigListener();
 
@@ -178,6 +181,7 @@
                 .asAtomicCounter();
 
         eventDispatcher.addSink(MetroPathEvent.class, listenerRegistry);
+        linkService.addListener(linkListener);
         intentService.addListener(intentListener);
         networkConfigService.addListener(netcfgListener);
 
@@ -188,6 +192,7 @@
     protected void deactivate() {
         networkConfigService.removeListener(netcfgListener);
         intentService.removeListener(intentListener);
+        linkService.removeListener(linkListener);
 
         factories.forEach(cfgRegistry::unregisterConfigFactory);
 
@@ -279,13 +284,17 @@
         log.info("removeConnectivity({})", id);
         MetroConnectivity connectivity = connectivities.remove(id);
 
+        if (connectivity == null) {
+            return false;
+        }
+
         // TODO withdraw intent only if all of connectivities that use the optical path are withdrawn
         connectivity.getRealizingLinks().forEach(l -> {
             Intent intent = intentService.getIntent(l.realizingIntentKey());
             intentService.withdraw(intent);
         });
 
-        return connectivity != null;
+        return true;
     }
 
     @Override
@@ -722,5 +731,30 @@
         }
 
     }
+
+    private class InternalLinkListener implements LinkListener {
+
+        @Override
+        public void event(LinkEvent event) {
+            switch (event.type()) {
+                case LINK_REMOVED:
+                    Link link = event.subject();
+                    Set<PacketLinkRealizedByOptical> pLinks = linkPathMap.keySet().stream()
+                            .filter(l -> l.equals(link.src(), link.dst()) || l.equals(link.dst(), link.src()))
+                            .collect(Collectors.toSet());
+
+                    pLinks.forEach(l -> {
+                        MetroConnectivity c = linkPathMap.get(l);
+                        // Notifies listeners if all links are gone
+                        if (c.isAllRealizingLinkNotEstablished()) {
+                            post(new MetroPathEvent(MetroPathEvent.Type.PATH_REMOVED, c.id()));
+                        }
+                        linkPathMap.remove(l);
+                    });
+                default:
+                    break;
+            }
+        }
+    }
 }