X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcontainermanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcontainermanager%2Finternal%2FActivator.java;h=aab07afa9e5d36bed64e22840cc169c3c2b2fee5;hb=51e9be2b3aac6ea33bf21e5a3a978325d24e9e0e;hp=9caa62072cc88c3b50cfa5a670dc53635d14b5d0;hpb=29f7cfb54b580928c7feac63abce028a7014b0d5;p=controller.git diff --git a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java index 9caa62072c..aab07afa9e 100644 --- a/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java +++ b/opendaylight/containermanager/implementation/src/main/java/org/opendaylight/controller/containermanager/internal/Activator.java @@ -9,108 +9,141 @@ package org.opendaylight.controller.containermanager.internal; -import org.opendaylight.controller.clustering.services.IClusterGlobalServices; +import org.eclipse.osgi.framework.console.CommandProvider; +import java.util.Dictionary; +import java.util.HashSet; +import java.util.Set; +import java.util.Hashtable; import org.opendaylight.controller.containermanager.IContainerManager; -import org.opendaylight.controller.sal.core.IContainerAware; +import org.apache.felix.dm.Component; +import org.opendaylight.controller.clustering.services.ICacheUpdateAware; +import org.opendaylight.controller.clustering.services.IClusterGlobalServices; +import org.opendaylight.controller.configuration.IConfigurationAware; +import org.opendaylight.controller.containermanager.IContainerAuthorization; +import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase; import org.opendaylight.controller.sal.core.IContainer; +import org.opendaylight.controller.sal.core.IContainerAware; import org.opendaylight.controller.sal.core.IContainerListener; -import org.apache.felix.dm.Component; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase; public class Activator extends ComponentActivatorAbstractBase { - protected static final Logger logger = LoggerFactory - .getLogger(Activator.class); + protected static final Logger logger = LoggerFactory.getLogger(Activator.class); /** - * Function called when the activator starts just after some - * initializations are done by the - * ComponentActivatorAbstractBase. + * Function called when the activator starts just after some initializations + * are done by the ComponentActivatorAbstractBase. * */ + @Override public void init() { } /** - * Function called when the activator stops just before the - * cleanup done by ComponentActivatorAbstractBase + * Function called when the activator stops just before the cleanup done by + * ComponentActivatorAbstractBase * */ + @Override public void destroy() { } /** - * Function that is used to communicate to dependency manager the - * list of known implementations for services inside a container + * Function that is used to communicate to dependency manager the list of + * known implementations for containerd-services * * * @return An array containing all the CLASS objects that will be - * instantiated in order to get an fully working implementation - * Object + * instantiated in order to get an fully working implementation + * Object */ + @Override public Object[] getImplementations() { Object[] res = { ContainerImpl.class }; return res; } /** - * Function that is called when configuration of the dependencies - * is required. + * Function that is called when configuration of the dependencies is + * required. * - * @param c dependency manager Component object, used for - * configuring the dependencies exported and imported - * @param imp Implementation class that is being configured, - * needed as long as the same routine can configure multiple - * implementations - * @param containerName The containerName being configured, this allow - * also optional per-container different behavior if needed, usually - * should not be the case though. + * @param c + * dependency manager Component object, used for configuring the + * dependencies exported and imported + * @param imp + * Implementation class that is being configured, needed as long + * as the same routine can configure multiple implementations + * @param containerName + * The containername being configured, this allow also optional + * per-container different behavior if needed, usually should not be + * the case though. */ + @Override public void configureInstance(Component c, Object imp, String containerName) { if (imp.equals(ContainerImpl.class)) { // export the service c.setInterface(new String[] { IContainer.class.getName() }, null); + + // private interface exported by ContainerManager to retrieve + // internal data, this is mandatory to implement the + // IContainer functionality + c.add(createServiceDependency().setService(IContainerInternal.class) + .setCallbacks("setIContainerInternal", "unsetIContainerInternal") + .setRequired(true)); } } /** - * Method which tells how many Global implementations are - * supported by the bundle. This way we can tune the number of - * components created. This components will be created ONLY at the - * time of bundle startup and will be destroyed only at time of - * bundle destruction, this is the major difference with the - * implementation retrieved via getImplementations where all of - * them are assumed to be in a container! + * Method which tells how many NON-containerd implementations are supported by + * the bundle. This way we can tune the number of components created. This + * components will be created ONLY at the time of bundle startup and will be + * destroyed only at time of bundle destruction, this is the major + * difference with the implementation retrieved via getImplementations where + * all of them are assumed to be containerd! * * - * @return The list of implementations the bundle will support, - * in Global version + * @return The list of implementations the bundle will support, in + * non-containerd version */ + @Override protected Object[] getGlobalImplementations() { Object[] res = { ContainerManager.class }; return res; } /** - * Configure the dependency for a given instance Global + * Configure the dependency for a given instance non-containerd * - * @param c Component assigned for this instance, this will be - * what will be used for configuration - * @param imp implementation to be configured - * @param containerName container on which the configuration happens + * @param c + * Component assigned for this instance, this will be what will + * be used for configuration + * @param imp + * implementation to be configured + * @param containerName + * container on which the configuration happens */ + @Override protected void configureGlobalInstance(Component c, Object imp) { if (imp.equals(ContainerManager.class)) { + Dictionary> props = new Hashtable>(); + Set propSet = new HashSet(); + propSet.add("containermgr.event.containerChange"); + props.put("cachenames", propSet); // export the service - c.setInterface(new String[] { IContainerManager.class.getName() }, - null); + c.setInterface( + new String[] { IContainerManager.class.getName(), + IContainerManager.class.getName(), + IConfigurationAware.class.getName(), + CommandProvider.class.getName(), + IContainerInternal.class.getName(), + IContainerAuthorization.class.getName(), + ICacheUpdateAware.class.getName()}, props); - c.add(createServiceDependency().setService( - IClusterGlobalServices.class).setCallbacks( - "setClusterServices", "unsetClusterServices").setRequired( - true)); + c.add(createServiceDependency() + .setService(IClusterGlobalServices.class) + .setCallbacks("setClusterServices", "unsetClusterServices") + .setRequired(true)); // Key kick-starter for container creation in each component c.add(createServiceDependency().setService(IContainerAware.class) @@ -121,8 +154,8 @@ public class Activator extends ComponentActivatorAbstractBase { // protocol plugins to setup proper filtering based on // slicing events c.add(createServiceDependency() - .setService(IContainerListener.class).setCallbacks( - "setIContainerListener", "unsetIContainerListener") + .setService(IContainerListener.class) + .setCallbacks("setIContainerListener", "unsetIContainerListener") .setRequired(false)); } }