X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fforwardingrulesmanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager%2Finternal%2FActivator.java;h=bbb9ad7b7385fe8f7fe09d17e1f9433d9382a417;hp=f6fc0012ad4219f368373cb10284e1c401e96a0f;hb=4ca5ea31c027f33cd4c8c84adece356c354c1c3a;hpb=400baaf54049cf4d6159e7c03b7c6e724eaa5aa5 diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java index f6fc0012ad..bbb9ad7b73 100644 --- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java +++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/Activator.java @@ -28,9 +28,7 @@ import org.opendaylight.controller.switchmanager.ISwitchManagerAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.opendaylight.controller.clustering.services.ICacheUpdateAware; import org.opendaylight.controller.clustering.services.IClusterContainerServices; -import org.opendaylight.controller.hosttracker.IfIptoHost; public class Activator extends ComponentActivatorAbstractBase { protected static final Logger logger = LoggerFactory.getLogger(Activator.class); @@ -66,7 +64,7 @@ public class Activator extends ComponentActivatorAbstractBase { */ @Override public Object[] getImplementations() { - Object[] res = { ForwardingRulesManagerImpl.class }; + Object[] res = { ForwardingRulesManager.class }; return res; } @@ -87,32 +85,25 @@ public class Activator extends ComponentActivatorAbstractBase { */ @Override public void configureInstance(Component c, Object imp, String containerName) { - if (imp.equals(ForwardingRulesManagerImpl.class)) { + if (imp.equals(ForwardingRulesManager.class)) { String interfaces[] = null; - Dictionary> props = new Hashtable>(); - Set propSet = new HashSet(); - propSet.add("frm.flowsSaveEvent"); - props.put("cachenames", propSet); // export the service interfaces = new String[] { IContainerListener.class.getName(), ISwitchManagerAware.class.getName(), IForwardingRulesManager.class.getName(), IInventoryListener.class.getName(), - ICacheUpdateAware.class.getName(), IConfigurationContainerAware.class.getName(), + IConfigurationContainerAware.class.getName(), IFlowProgrammerListener.class.getName() }; - c.setInterface(interfaces, props); + c.setInterface(interfaces, null); c.add(createContainerServiceDependency(containerName).setService(IFlowProgrammerService.class) .setCallbacks("setFlowProgrammerService", "unsetFlowProgrammerService").setRequired(true)); - c.add(createContainerServiceDependency(containerName).setService(IClusterContainerServices.class) .setCallbacks("setClusterContainerService", "unsetClusterContainerService").setRequired(true)); c.add(createContainerServiceDependency(containerName).setService(ISwitchManager.class) .setCallbacks("setSwitchManager", "unsetSwitchManager").setRequired(true)); c.add(createContainerServiceDependency(containerName).setService(IForwardingRulesManagerAware.class) .setCallbacks("setFrmAware", "unsetFrmAware").setRequired(false)); - c.add(createContainerServiceDependency(containerName).setService(IfIptoHost.class) - .setCallbacks("setHostFinder", "unsetHostFinder").setRequired(true)); c.add(createContainerServiceDependency(containerName).setService(IContainer.class) .setCallbacks("setIContainer", "unsetIContainer").setRequired(true)); }