Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changed TopologyManager to ignore edges that contain invalid node connectors.
[controller.git]
/
opendaylight
/
topologymanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
topologymanager
/
internal
/
Activator.java
diff --git
a/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java
b/opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java
index 30a9445b1d5582fe1f78573d4a7b0e0e28674a5e..b2a096aa7b36c3d3c85a2a54a9bbefe5b05e2836 100644
(file)
--- a/
opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java
+++ b/
opendaylight/topologymanager/implementation/src/main/java/org/opendaylight/controller/topologymanager/internal/Activator.java
@@
-21,6
+21,7
@@
import org.opendaylight.controller.configuration.IConfigurationContainerAware;
import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
import org.opendaylight.controller.sal.topology.IListenTopoUpdates;
import org.opendaylight.controller.sal.topology.ITopologyService;
import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
import org.opendaylight.controller.sal.topology.IListenTopoUpdates;
import org.opendaylight.controller.sal.topology.ITopologyService;
+import org.opendaylight.controller.switchmanager.ISwitchManager;
import org.opendaylight.controller.topologymanager.ITopologyManager;
import org.opendaylight.controller.topologymanager.ITopologyManagerAware;
import org.opendaylight.controller.topologymanager.ITopologyManagerClusterWideAware;
import org.opendaylight.controller.topologymanager.ITopologyManager;
import org.opendaylight.controller.topologymanager.ITopologyManagerAware;
import org.opendaylight.controller.topologymanager.ITopologyManagerClusterWideAware;
@@
-78,6
+79,10
@@
public class Activator extends ComponentActivatorAbstractBase {
ITopologyService.class).setCallbacks("setTopoService",
"unsetTopoService").setRequired(true));
ITopologyService.class).setCallbacks("setTopoService",
"unsetTopoService").setRequired(true));
+ c.add(createContainerServiceDependency(containerName).setService(
+ ISwitchManager.class).setCallbacks("setSwitchManager",
+ "unsetSwitchManager").setRequired(true));
+
// These are all the listeners for a topology manager
// updates, there could be many or none
c.add(createContainerServiceDependency(containerName).setService(
// These are all the listeners for a topology manager
// updates, there could be many or none
c.add(createContainerServiceDependency(containerName).setService(