Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move stats caching to FM StatisticsManager
[controller.git]
/
opendaylight
/
sal
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
implementation
/
internal
/
Activator.java
diff --git
a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java
b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java
index 1a9675a0d445dc953030f10875d2ec95ae2b06aa..85d239f4b9e1c52a265e2cb685fcb64925dac3d2 100644
(file)
--- a/
opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java
+++ b/
opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/Activator.java
@@
-23,7
+23,9
@@
import org.opendaylight.controller.sal.packet.IListenDataPacket;
import org.opendaylight.controller.sal.packet.IPluginInDataPacketService;
import org.opendaylight.controller.sal.packet.IPluginOutDataPacketService;
import org.opendaylight.controller.sal.reader.IPluginInReadService;
import org.opendaylight.controller.sal.packet.IPluginInDataPacketService;
import org.opendaylight.controller.sal.packet.IPluginOutDataPacketService;
import org.opendaylight.controller.sal.reader.IPluginInReadService;
+import org.opendaylight.controller.sal.reader.IPluginOutReadService;
import org.opendaylight.controller.sal.reader.IReadService;
import org.opendaylight.controller.sal.reader.IReadService;
+import org.opendaylight.controller.sal.reader.IReadServiceListener;
import org.opendaylight.controller.sal.topology.IListenTopoUpdates;
import org.opendaylight.controller.sal.topology.IPluginInTopologyService;
import org.opendaylight.controller.sal.topology.IPluginOutTopologyService;
import org.opendaylight.controller.sal.topology.IListenTopoUpdates;
import org.opendaylight.controller.sal.topology.IPluginInTopologyService;
import org.opendaylight.controller.sal.topology.IPluginOutTopologyService;
@@
-138,21
+140,29
@@
public class Activator extends ComponentActivatorAbstractBase {
.setService(IPluginInFlowProgrammerService.class)
.setCallbacks("setService", "unsetService")
.setRequired(false));
.setService(IPluginInFlowProgrammerService.class)
.setCallbacks("setService", "unsetService")
.setRequired(false));
- c.add(create
ServiceDependency(
)
+ c.add(create
ContainerServiceDependency(containerName
)
.setService(IFlowProgrammerListener.class)
.setCallbacks("setListener", "unsetListener")
.setRequired(false));
}
if (imp.equals(ReadService.class)) {
.setService(IFlowProgrammerListener.class)
.setCallbacks("setListener", "unsetListener")
.setRequired(false));
}
if (imp.equals(ReadService.class)) {
- // It is the provider of IReadService
- c.setInterface(IReadService.class.getName(), null);
+ // export services
+ c.setInterface(new String[] {
+ IReadService.class.getName(),IPluginOutReadService.class.getName()}, null);
// It is also the consumer of IPluginInReadService
c.add(createContainerServiceDependency(containerName)
.setService(IPluginInReadService.class)
.setCallbacks("setService", "unsetService")
// It is also the consumer of IPluginInReadService
c.add(createContainerServiceDependency(containerName)
.setService(IPluginInReadService.class)
.setCallbacks("setService", "unsetService")
- .setRequired(true));
+ .setRequired(false));
+
+ //consumes plugins' reader updates
+ c.add(createContainerServiceDependency(containerName)
+ .setService(IReadServiceListener.class)
+ .setCallbacks("setReaderListener", "unsetReaderListener")
+ .setRequired(false));
+
}
/************************/
}
/************************/