Merge "Move init and destroy empty impl from Activator classes. Have only one empty...

[controller.git] / opendaylight / hosttracker_new / implementation / src / main / java / org / opendaylight / controller / hosttracker / internal / Activator.java

diff --git a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java b/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java
index 631a65ae128784ed56d79b29e464115765bbbfee..99be54e77eafe0372bb0b65034ee5af6da64a1db 100644 (file)
--- a/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java
+++ b/opendaylight/hosttracker_new/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/Activator.java
@@ -13,6 +13,8 @@ import java.util.Hashtable;
 
 import org.apache.felix.dm.Component;
 import org.opendaylight.controller.hosttracker.IDeviceService;
+import org.opendaylight.controller.hosttracker.IfIptoHost;
+import org.opendaylight.controller.hosttracker.IfNewHostNotify;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
 import org.opendaylight.controller.sal.packet.IDataPacketService;
 import org.opendaylight.controller.sal.packet.IListenDataPacket;
@@ -26,15 +28,6 @@ public class Activator extends ComponentActivatorAbstractBase {
     protected static final Logger logger = LoggerFactory
             .getLogger(Activator.class);
 
-    @Override
-    protected void init() {
-
-    }
-
-    @Override
-    protected void destroy() {
-
-    }
 
     /**
      * Function that is used to communicate to dependency manager the list of
@@ -74,9 +67,11 @@ public class Activator extends ComponentActivatorAbstractBase {
             Dictionary<String, String> props = new Hashtable<String, String>();
             props.put("salListenerName", "devicemanager");
 
-            c.setInterface(new String[] { IDeviceService.class.getName(),
-                    IListenDataPacket.class.getName(),
-                    ITopologyManagerAware.class.getName() }, props);
+            c.setInterface(
+                    new String[] { IDeviceService.class.getName(),
+                            IfIptoHost.class.getName(),
+                            IListenDataPacket.class.getName(),
+                            ITopologyManagerAware.class.getName() }, props);
 
             c.add(createContainerServiceDependency(containerName)
                     .setService(ISwitchManager.class)
@@ -88,6 +83,11 @@ public class Activator extends ComponentActivatorAbstractBase {
                     .setCallbacks("setDataPacketService",
                             "unsetDataPacketService").setRequired(true));
 
+            c.add(createContainerServiceDependency(containerName)
+                    .setService(IfNewHostNotify.class)
+                    .setCallbacks("setNewHostNotify",
+                            "unsetNewHostNotify").setRequired(false));
+
             // c.add(createContainerServiceDependency(containerName).setService(
             // IClusterContainerServices.class).setCallbacks(
             // "setClusterContainerService",
@@ -96,11 +96,6 @@ public class Activator extends ComponentActivatorAbstractBase {
                     .setService(ITopologyManager.class)
                     .setCallbacks("setTopologyManager", "unsetTopologyManager")
                     .setRequired(false));
-
-            c.add(createContainerServiceDependency(containerName)
-                    .setService(IDataPacketService.class)
-                    .setCallbacks("setDataPacketService",
-                            "unsetDataPacketService").setRequired(true));
         }
     }