Add a simple l2agent for demo.

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

diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml
index ed7f2fa5cdabf484e113bbe9594ba77fe8c489f4..84df90b5a512513a2e03d7a857b52874f6bc432a 100644 (file)
--- a/affinity/implementation/pom.xml
+++ b/affinity/implementation/pom.xml
@@ -124,13 +124,8 @@
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-<<<<<<< HEAD
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>l2agent</artifactId>
-=======
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>tutorial_L2_forwarding</artifactId>
->>>>>>> Add flow pushing rules.
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
   </dependencies>

diff --git a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
index fa3ee3d614899ba50f08e2083779b0793f5887d0..c65531f57f611b85d2761d11560e6e0d4393c859 100644 (file)
--- a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
@@ -90,6 +90,7 @@ import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.opendaylight.affinity.l2agent.L2Agent;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -244,20 +245,12 @@ public class AffinityManagerImpl implements IAffinityManager, IConfigurationCont
             this.fps = null;
         }
     }
-<<<<<<< HEAD
     public void setL2Agent(L2Agent s)
-=======
-    public void setL2Agent(TutorialL2Forwarding s)
->>>>>>> Add flow pushing rules.
     {
         this.l2agent = s;
     }
 
-<<<<<<< HEAD
     public void unsetL2Agent(L2Agent s) {
-=======
-    public void unsetL2Agent(TutorialL2Forwarding s) {
->>>>>>> Add flow pushing rules.
         if (this.l2agent == s) {
             this.l2agent = null;
         }