Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ISSUE
[controller.git]
/
opendaylight
/
routing
/
dijkstra_implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
routing
/
dijkstra_implementation
/
internal
/
Activator.java
diff --git
a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
index 2137cda5b03ba958cb468f4b4c37b2d6a8490716..2ee1583af7ebebe7f089f2992220f69e25338ade 100644
(file)
--- a/
opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
+++ b/
opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
@@
-18,9
+18,10
@@
import org.slf4j.LoggerFactory;
import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
import org.opendaylight.controller.sal.routing.IListenRoutingUpdates;
import org.opendaylight.controller.sal.routing.IRouting;
import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
import org.opendaylight.controller.sal.routing.IListenRoutingUpdates;
import org.opendaylight.controller.sal.routing.IRouting;
-import org.opendaylight.controller.sal.topology.IListenTopoUpdates;
import org.opendaylight.controller.switchmanager.ISwitchManager;
import org.opendaylight.controller.sal.reader.IReadService;
import org.opendaylight.controller.switchmanager.ISwitchManager;
import org.opendaylight.controller.sal.reader.IReadService;
+import org.opendaylight.controller.topologymanager.ITopologyManager;
+import org.opendaylight.controller.topologymanager.ITopologyManagerAware;
public class Activator extends ComponentActivatorAbstractBase {
protected static final Logger logger = LoggerFactory
public class Activator extends ComponentActivatorAbstractBase {
protected static final Logger logger = LoggerFactory
@@
-33,7
+34,6
@@
public class Activator extends ComponentActivatorAbstractBase {
*
*/
public void init() {
*
*/
public void init() {
- logger.debug("routing.dijkstra_implementation INIT called!");
}
/**
}
/**
@@
-76,8
+76,8
@@
public class Activator extends ComponentActivatorAbstractBase {
if (imp.equals(DijkstraImplementation.class)) {
// export the service
Dictionary<String, String> props = new Hashtable<String, String>();
if (imp.equals(DijkstraImplementation.class)) {
// export the service
Dictionary<String, String> props = new Hashtable<String, String>();
- props.put("
sal
ListenerName", "routing.Dijkstra");
- c.setInterface(new String[] { I
ListenTopoUpdates
.class.getName(),
+ props.put("
topo
ListenerName", "routing.Dijkstra");
+ c.setInterface(new String[] { I
TopologyManagerAware
.class.getName(),
IRouting.class.getName() }, props);
// Now lets add a service dependency to make sure the
IRouting.class.getName() }, props);
// Now lets add a service dependency to make sure the
@@
-91,6
+91,10
@@
public class Activator extends ComponentActivatorAbstractBase {
ISwitchManager.class).setCallbacks("setSwitchManager",
"unsetSwitchManager").setRequired(true));
ISwitchManager.class).setCallbacks("setSwitchManager",
"unsetSwitchManager").setRequired(true));
+ c.add(createContainerServiceDependency(containerName).setService(
+ ITopologyManager.class).setCallbacks("setTopologyManager",
+ "unsetTopologyManager").setRequired(true));
+
c.add(createContainerServiceDependency(containerName).setService(
IReadService.class).setCallbacks("setReadService",
"unsetReadService").setRequired(true));
c.add(createContainerServiceDependency(containerName).setService(
IReadService.class).setCallbacks("setReadService",
"unsetReadService").setRequired(true));