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=9b69d4414435747059aa045cb6c2654c1ba14604;hb=a84d1bd3fba5d6fb7d9777e1508221e2f773e94f;hp=21af047c3d79a5cb2d6c2508e05f9121b119be71;hpb=82c8b8d0a8584735a02146b437f38ebdaebd9194;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 21af047c3d..9b69d44144 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
@@ -142,11 +142,11 @@ 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){
 				
-				val adsalFlow = ToSalConversionsUtils.toFlow(flow);
+				val adsalFlow = ToSalConversionsUtils.toFlow(flow,node);
 				val statsFromDataStore = flow.getAugmentation(FlowStatisticsData);
 				
 				if(statsFromDataStore != null){
@@ -248,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))){
@@ -367,7 +367,10 @@ class InventoryAndReadAdapter implements IPluginInReadService,
         
         for (statsPublisher : statisticsPublisher){
 			val nodeRef = InstanceIdentifier.builder(Nodes).child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node,new NodeKey(notification.id)).toInstance;
-			statsPublisher.descriptionStatisticsUpdated(nodeRef.toADNode,toNodeDescription(notification.nodeRef));
+            val description = notification.nodeRef.toNodeDescription
+            if(description != null) {
+			  statsPublisher.descriptionStatisticsUpdated(nodeRef.toADNode,description);
+			}
 		}
     }
 
@@ -434,9 +437,12 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 
     private def FlowCapableNode readFlowCapableNode(NodeRef ref) {
         val dataObject = dataService.readOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
-        val node = dataObject.checkInstanceOf(
-            org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node);
-        return node.getAugmentation(FlowCapableNode);
+        if(dataObject != null) {
+            val node = dataObject.checkInstanceOf(
+                org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node);
+            return node.getAugmentation(FlowCapableNode);
+        }
+        return null;
     }
 
     private def FlowCapableNodeConnector readFlowCapableNodeConnector(NodeConnectorRef ref) {
@@ -492,14 +498,16 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 	
 	private def toNodeDescription(NodeRef nodeRef){
 		val capableNode = readFlowCapableNode(nodeRef);
-
-        val it = new NodeDescription()
-        manufacturer = capableNode.manufacturer
-        serialNumber = capableNode.serialNumber
-        software = capableNode.software
-        description = capableNode.description
-        
-        return it;
+        if(capableNode !=null) {
+            val it = new NodeDescription()
+            manufacturer = capableNode.manufacturer
+            serialNumber = capableNode.serialNumber
+            software = capableNode.software
+            description = capableNode.description
+            
+            return it;
+         }
+         return null;
 	}
     
     
@@ -517,14 +525,14 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 	override onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) {
 		
 		val adsalFlowsStatistics = new ArrayList<FlowOnNode>();
+		val nodeRef = InstanceIdentifier.builder(Nodes).child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node,new NodeKey(notification.id)).toInstance;
 		
 		for(flowStats : notification.flowAndStatisticsMapList){
 			if(flowStats.tableId == 0)
-				adsalFlowsStatistics.add(toFlowOnNode(flowStats));
+				adsalFlowsStatistics.add(toFlowOnNode(flowStats,nodeRef.toADNode));
 		}
 		
 		for (statsPublisher : statisticsPublisher){
-			val nodeRef = InstanceIdentifier.builder(Nodes).child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node,new NodeKey(notification.id)).toInstance;
 			statsPublisher.nodeFlowStatisticsUpdated(nodeRef.toADNode,adsalFlowsStatistics);
 		}
 		
@@ -569,9 +577,9 @@ class InventoryAndReadAdapter implements IPluginInReadService,
 		
 	}
 	
-	private static def toFlowOnNode (FlowAndStatisticsMapList flowAndStatsMap){
+	private static def toFlowOnNode (FlowAndStatisticsMapList flowAndStatsMap,Node node){
 		
-		val it = new FlowOnNode(ToSalConversionsUtils.toFlow(flowAndStatsMap));
+		val it = new FlowOnNode(ToSalConversionsUtils.toFlow(flowAndStatsMap,node));
 		
 		byteCount = flowAndStatsMap.byteCount.value.longValue;
 		packetCount = flowAndStatsMap.packetCount.value.longValue;