X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2FInventoryAndReadAdapter.xtend;h=39d224ba164c937dc9ca389259f640a22b177d20;hb=9390dd5bea2420cdbb1e4f6c2029091811c4df5a;hp=47a3d113254eee1ad85a66a63132de283fe4ac73;hpb=b209f8b1f0fa2f68563232bc966e042285d9cc42;p=controller.git

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend
index 47a3d11325..39d224ba16 100644
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryAndReadAdapter.xtend
@@ -3,6 +3,8 @@ package org.opendaylight.controller.sal.compatibility
 import java.util.ArrayList
 import java.util.Collections
 import java.util.List
+import java.util.Set
+import java.util.concurrent.CopyOnWriteArrayList;
 import org.opendaylight.controller.sal.binding.api.data.DataBrokerService
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService
 import org.opendaylight.controller.sal.core.Edge
@@ -93,15 +95,23 @@ class InventoryAndReadAdapter implements IPluginInReadService,
     @Property
     OpendaylightFlowTableStatisticsService flowTableStatisticsService;
 
-    @Property
-    IPluginOutInventoryService inventoryPublisher;
-
     @Property
     FlowTopologyDiscoveryService topologyDiscovery;
     
     @Property
-    List<IPluginOutReadService> statisticsPublisher = new ArrayList<IPluginOutReadService>();
-	
+    List<IPluginOutReadService> statisticsPublisher = new CopyOnWriteArrayList<IPluginOutReadService>();
+
+    @Property
+    List<IPluginOutInventoryService> inventoryPublisher = new CopyOnWriteArrayList<IPluginOutInventoryService>();
+
+	def setInventoryPublisher(IPluginOutInventoryService listener){
+        inventoryPublisher.add(listener);
+	}
+
+	def unsetInventoryPublisher(IPluginOutInventoryService listener){
+        inventoryPublisher.remove(listener);
+	}
+
     def setReadPublisher(IPluginOutReadService listener) {
     	statisticsPublisher.add(listener);
     }
@@ -132,7 +142,7 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 		val table= it.readConfigurationData(tableRef) as Table;
 		
 		if(table != null){
-			LOG.info("Number of flows installed in table 0 of node {} : {}",node,table.flow.size);
+			LOG.trace("Number of flows installed in table 0 of node {} : {}",node,table.flow.size);
 			
 			for(flow : table.flow){
 				
@@ -238,7 +248,7 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 		val table= it.readConfigurationData(tableRef) as Table;
 		
 		if(table != null){
-			LOG.info("Number of flows installed in table 0 of node {} : {}",node,table.flow.size);
+			LOG.trace("Number of flows installed in table 0 of node {} : {}",node,table.flow.size);
 			
 			for(mdsalFlow : table.flow){
 				if(FromSalConversionsUtils.flowEquals(mdsalFlow, MDFlowMapping.toMDSalflow(targetFlow))){
@@ -330,7 +340,7 @@ class InventoryAndReadAdapter implements IPluginInReadService,
     override onNodeRemoved(NodeRemoved notification) {
         val properties = Collections.<org.opendaylight.controller.sal.core.Property>emptySet();
 
-        inventoryPublisher.updateNode(notification.nodeRef.toADNode, UpdateType.REMOVED, properties);
+        publishNodeUpdate(notification.nodeRef.toADNode, UpdateType.REMOVED, properties);
     }
 
     override onNodeConnectorUpdated(NodeConnectorUpdated update) {
@@ -341,7 +351,7 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 
         var nodeConnector = update.nodeConnectorRef.toADNodeConnector
 
-        inventoryPublisher.updateNodeConnector(nodeConnector , updateType , update.toADNodeConnectorProperties);
+        publishNodeConnectorUpdate(nodeConnector , updateType , update.toADNodeConnectorProperties);
     }
 
     override onNodeUpdated(NodeUpdated notification) {
@@ -351,7 +361,7 @@ class InventoryAndReadAdapter implements IPluginInReadService,
         if ( this._dataService.readOperationalData(identifier) == null ){
             updateType = UpdateType.ADDED;
         }
-        inventoryPublisher.updateNode(notification.nodeRef.toADNode, updateType, notification.toADNodeProperties);
+        publishNodeUpdate(notification.nodeRef.toADNode, updateType, notification.toADNodeProperties);
         
 		//Notify the listeners of IPluginOutReadService
         
@@ -574,4 +584,17 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 	override  getConfiguredNotConnectedNodes() {
         return Collections.emptySet();
 	}
+
+
+	private def publishNodeUpdate(Node node, UpdateType updateType, Set<org.opendaylight.controller.sal.core.Property> properties){
+	    for( publisher : inventoryPublisher){
+	        publisher.updateNode(node, updateType, properties);
+	    }
+	}
+
+	private def publishNodeConnectorUpdate(org.opendaylight.controller.sal.core.NodeConnector nodeConnector, UpdateType updateType, Set<org.opendaylight.controller.sal.core.Property> properties){
+	    for( publisher : inventoryPublisher){
+	        publisher.updateNodeConnector(nodeConnector, updateType, properties);
+	    }
+	}
 }