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=47a3d113254eee1ad85a66a63132de283fe4ac73;hb=f4af9d60d50ef6be66290641263dbebe95e2894c;hp=56ca1b609cf2c6eeb6d5dfe669b660319d4d792d;hpb=0e638c09424ae43d1bcbd8a6ee32011f467726a6;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 56ca1b609c..47a3d11325 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 @@ -137,7 +137,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, for(flow : table.flow){ val adsalFlow = ToSalConversionsUtils.toFlow(flow); - val statsFromDataStore = flow.getAugmentation(FlowStatisticsData) as FlowStatisticsData; + val statsFromDataStore = flow.getAugmentation(FlowStatisticsData); if(statsFromDataStore != null){ val it = new FlowOnNode(adsalFlow); @@ -207,7 +207,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, for (table : dsFlowCapableNode.table){ - val tableStats = table.getAugmentation(FlowTableStatisticsData) as FlowTableStatisticsData; + val tableStats = table.getAugmentation(FlowTableStatisticsData); if(tableStats != null){ ret.add(toNodeTableStatistics(tableStats.flowTableStatistics,table.id,node)); @@ -242,7 +242,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, for(mdsalFlow : table.flow){ if(FromSalConversionsUtils.flowEquals(mdsalFlow, MDFlowMapping.toMDSalflow(targetFlow))){ - val statsFromDataStore = mdsalFlow.getAugmentation(FlowStatisticsData) as FlowStatisticsData; + val statsFromDataStore = mdsalFlow.getAugmentation(FlowStatisticsData); if(statsFromDataStore != null){ LOG.debug("Found matching flow in the data store flow table "); @@ -308,7 +308,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, val table= it.readConfigurationData(tableRef) as Table; if(table != null){ - val tableStats = table.getAugmentation(FlowTableStatisticsData) as FlowTableStatisticsData; + val tableStats = table.getAugmentation(FlowTableStatisticsData); if(tableStats != null){ nodeStats = toNodeTableStatistics(tableStats.flowTableStatistics,table.id,nodeTable.node); @@ -345,7 +345,6 @@ class InventoryAndReadAdapter implements IPluginInReadService, } override onNodeUpdated(NodeUpdated notification) { - val properties = Collections.emptySet(); val InstanceIdentifier identifier = notification.nodeRef.value as InstanceIdentifier; var updateType = UpdateType.CHANGED; @@ -502,7 +501,7 @@ class InventoryAndReadAdapter implements IPluginInReadService, * OpendaylightFlowStatisticsListener interface implementation */ override onAggregateFlowStatisticsUpdate(AggregateFlowStatisticsUpdate notification) { - throw new UnsupportedOperationException("TODO: auto-generated method stub") + //Ignoring this notification as there does not seem to be a way to bubble this up to AD-SAL } override onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) { @@ -571,4 +570,8 @@ class InventoryAndReadAdapter implements IPluginInReadService, return it; } + + override getConfiguredNotConnectedNodes() { + return Collections.emptySet(); + } }