Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-2637: migration consequence - fix unit test
[controller.git]
/
opendaylight
/
md-sal
/
compatibility
/
sal-compatibility
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
compatibility
/
topology
/
TopologyAdapter.java
diff --git
a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
index b609addae48f78d948a0940a6c889fd0a44d0479..4e3cf69817a3f68eeeb5cf9f5bbaac4ef59512bc 100644
(file)
--- a/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
+++ b/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/topology/TopologyAdapter.java
@@
-23,8
+23,10
@@
public class TopologyAdapter implements IPluginInTopologyService {
private final InstanceIdentifier<Topology> topology = InstanceIdentifier.builder(NetworkTopology.class)
.child(Topology.class, new TopologyKey(new TopologyId("flow:1"))).toInstance();
private final InstanceIdentifier<Topology> topology = InstanceIdentifier.builder(NetworkTopology.class)
.child(Topology.class, new TopologyKey(new TopologyId("flow:1"))).toInstance();
- //
FIXME: seems to be unused
+ //
Injected via Apache DM
private IPluginOutTopologyService topologyPublisher;
private IPluginOutTopologyService topologyPublisher;
+
+
private DataProviderService dataService;
public void setDataService(final DataProviderService dataService) {
private DataProviderService dataService;
public void setDataService(final DataProviderService dataService) {
@@
-37,4
+39,12
@@
public class TopologyAdapter implements IPluginInTopologyService {
final Topology t = reader.readOperationalData(topology);
topologyPublisher.edgeUpdate(TopologyMapping.toADEdgeUpdates(t, reader));
}
final Topology t = reader.readOperationalData(topology);
topologyPublisher.edgeUpdate(TopologyMapping.toADEdgeUpdates(t, reader));
}
+
+ public IPluginOutTopologyService getTopologyPublisher() {
+ return topologyPublisher;
+ }
+
+ public void setTopologyPublisher(final IPluginOutTopologyService topologyPublisher) {
+ this.topologyPublisher = topologyPublisher;
+ }
}
}