Initial fix to topology-adapter.

Change-Id: Idf3f69dbcfef80aa485749050aa703e455b3e81f
Signed-off-by: Ed Warnicke <eaw@cisco.com>

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 31ae745d73054ed0c046d94c05c8f38ba26f786f..2124185b6c297906d617cbef74d9481e6367ace9 100644 (file)
--- 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
@@ -105,9 +105,6 @@ class InventoryAndReadAdapter implements IPluginInTopologyService,
 
     @Property
     IPluginOutTopologyService topologyPublisher;
 
     @Property
     IPluginOutTopologyService topologyPublisher;

-    
-    @Property
-    IDiscoveryService discoveryPublisher;

 
     @Property
     FlowTopologyDiscoveryService topologyDiscovery;
 
     @Property
     FlowTopologyDiscoveryService topologyDiscovery;


@@ -470,7 +467,6 @@ class InventoryAndReadAdapter implements IPluginInTopologyService,
     
     override onLinkDiscovered(LinkDiscovered notification) {
         val update = new TopoEdgeUpdate(notification.toADEdge,Collections.emptySet(),UpdateType.ADDED);
     
     override onLinkDiscovered(LinkDiscovered notification) {
         val update = new TopoEdgeUpdate(notification.toADEdge,Collections.emptySet(),UpdateType.ADDED);

-        discoveryPublisher.notifyEdge(notification.toADEdge,UpdateType.ADDED,Collections.emptySet());

         topologyPublisher.edgeUpdate(Collections.singletonList(update))
     }
     
         topologyPublisher.edgeUpdate(Collections.singletonList(update))
     }