Added dependency on hosttracker to affinitymanager

Signed-off-by: Katrina LaCurts <katrina.lacurts@plexxi.com>
Conflicts:
	affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java

Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>

diff --git a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
index 98ec073d3f3ab91afebd6967011889c4fed613a8..e9332dfc05ba0dce750e9d2abb629739433c2f7c 100644 (file)
--- a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/Activator.java
@@ -17,13 +17,13 @@ import org.apache.felix.dm.Component;
 import org.opendaylight.controller.clustering.services.ICacheUpdateAware;
 import org.opendaylight.controller.clustering.services.IClusterContainerServices;
 import org.opendaylight.controller.configuration.IConfigurationContainerAware;
+import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
 import org.opendaylight.affinity.affinity.IAffinityManager;
 import org.opendaylight.affinity.affinity.IAffinityManagerAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.controller.sal.flowprogrammer.IFlowProgrammerService;
-import org.opendaylight.affinity.l2agent.L2Agent;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
 
 /**
@@ -107,14 +107,12 @@ public class Activator extends ComponentActivatorAbstractBase {
                     IFlowProgrammerService.class).setCallbacks(
                     "setFlowProgrammerService", "unsetFlowProgrammerService")
                     .setRequired(true));
-            c.add(createContainerServiceDependency(containerName).setService(
-                    L2Agent.class).setCallbacks(
-                    "setL2AgentService", "unsetL2AgentService")
-                    .setRequired(true));
             c.add(createContainerServiceDependency(containerName).setService(
                     ISwitchManager.class).setCallbacks(
                     "setSwitchManager", "unsetSwitchManager")
                     .setRequired(true));
+            c.add(createContainerServiceDependency(containerName).setService(IfIptoHost.class)
+                  .setCallbacks("setHostTracker", "unsetHostTracker").setRequired(true));
         }
     }
 }