Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
OF plugin classes must have a strict dependency on Connection Service
[controller.git]
/
opendaylight
/
protocol_plugins
/
openflow
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
protocol_plugin
/
openflow
/
internal
/
TopologyServices.java
diff --git
a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
index c0b296345e261e18c6a0d0e3c58816183c734331..68572fb65086ef4c7901dc4179caf03e57c12233 100644
(file)
--- a/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
+++ b/
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
@@
-10,9
+10,6
@@
package org.opendaylight.controller.protocol_plugin.openflow.internal;
import java.util.Dictionary;
import java.util.List;
import java.util.Dictionary;
import java.util.List;
-import java.util.Set;
-import java.util.ArrayList;
-
import org.apache.felix.dm.Component;
import org.opendaylight.controller.protocol_plugin.openflow.IRefreshInternalProvider;
import org.opendaylight.controller.protocol_plugin.openflow.ITopologyServiceShimListener;
import org.apache.felix.dm.Component;
import org.opendaylight.controller.protocol_plugin.openflow.IRefreshInternalProvider;
import org.opendaylight.controller.protocol_plugin.openflow.ITopologyServiceShimListener;
@@
-20,8
+17,6
@@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.controller.sal.core.Edge;
import org.slf4j.LoggerFactory;
import org.opendaylight.controller.sal.core.Edge;
-import org.opendaylight.controller.sal.core.Property;
-import org.opendaylight.controller.sal.core.UpdateType;
import org.opendaylight.controller.sal.topology.IPluginInTopologyService;
import org.opendaylight.controller.sal.topology.IPluginOutTopologyService;
import org.opendaylight.controller.sal.topology.TopoEdgeUpdate;
import org.opendaylight.controller.sal.topology.IPluginInTopologyService;
import org.opendaylight.controller.sal.topology.IPluginOutTopologyService;
import org.opendaylight.controller.sal.topology.TopoEdgeUpdate;
@@
-37,7
+32,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* Function called by the dependency manager when all the required
* dependencies are satisfied
/**
* Function called by the dependency manager when all the required
* dependencies are satisfied
- *
+ *
*/
@SuppressWarnings("unchecked")
void init(Component c) {
*/
@SuppressWarnings("unchecked")
void init(Component c) {
@@
-51,7
+46,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
* Function called by the dependency manager when at least one dependency
* become unsatisfied or when the component is shutting down because for
* example bundle is being stopped.
* Function called by the dependency manager when at least one dependency
* become unsatisfied or when the component is shutting down because for
* example bundle is being stopped.
- *
+ *
*/
void destroy() {
logger.trace("DESTROY called!");
*/
void destroy() {
logger.trace("DESTROY called!");
@@
-60,7
+55,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* Function called by dependency manager after "init ()" is called and after
* the services provided by the class are registered in the service registry
/**
* Function called by dependency manager after "init ()" is called and after
* the services provided by the class are registered in the service registry
- *
+ *
*/
void start() {
logger.trace("START called!");
*/
void start() {
logger.trace("START called!");
@@
-70,7
+65,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
* Function called by the dependency manager before the services exported by
* the component are unregistered, this will be followed by a "destroy ()"
* calls
* Function called by the dependency manager before the services exported by
* the component are unregistered, this will be followed by a "destroy ()"
* calls
- *
+ *
*/
void stop() {
logger.trace("STOP called!");
*/
void stop() {
logger.trace("STOP called!");
@@
-78,7
+73,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* Retrieve SAL service IPluginOutTopologyService
/**
* Retrieve SAL service IPluginOutTopologyService
- *
+ *
* @param s
* Called by Dependency Manager as soon as the SAL service is
* available
* @param s
* Called by Dependency Manager as soon as the SAL service is
* available
@@
-90,7
+85,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* called when SAL service IPluginOutTopologyService is no longer available
/**
* called when SAL service IPluginOutTopologyService is no longer available
- *
+ *
* @param s
* Called by Dependency Manager as soon as the SAL service is
* unavailable
* @param s
* Called by Dependency Manager as soon as the SAL service is
* unavailable
@@
-104,7
+99,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* Retrieve OF protocol_plugin service IRefreshInternalProvider
/**
* Retrieve OF protocol_plugin service IRefreshInternalProvider
- *
+ *
* @param s
* Called by Dependency Manager as soon as the SAL service is
* available
* @param s
* Called by Dependency Manager as soon as the SAL service is
* available
@@
-117,7
+112,7
@@
public class TopologyServices implements ITopologyServiceShimListener,
/**
* called when OF protocol_plugin service IRefreshInternalProvider is no
* longer available
/**
* called when OF protocol_plugin service IRefreshInternalProvider is no
* longer available
- *
+ *
* @param s
* Called by Dependency Manager as soon as the SAL service is
* unavailable
* @param s
* Called by Dependency Manager as soon as the SAL service is
* unavailable
@@
-130,11
+125,8
@@
public class TopologyServices implements ITopologyServiceShimListener,
}
@Override
}
@Override
- public void edgeUpdate(
Edge edge, UpdateType type, Set<Property> props
) {
+ public void edgeUpdate(
List<TopoEdgeUpdate> topoedgeupdateList
) {
if (this.salTopoService != null) {
if (this.salTopoService != null) {
- List<TopoEdgeUpdate> topoedgeupdateList = new ArrayList<TopoEdgeUpdate>();
- TopoEdgeUpdate teu = new TopoEdgeUpdate(edge, props, type);
- topoedgeupdateList.add(teu);
this.salTopoService.edgeUpdate(topoedgeupdateList);
}
}
this.salTopoService.edgeUpdate(topoedgeupdateList);
}
}