Fixes to make path redirect affinity work using the new nfchainagent service.

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

diff --git a/affinity/api/pom.xml b/affinity/api/pom.xml
index 256772834404a8cfe946c5f14ccc52b9ab416e6d..922421ae2337676c81951ea7b2e39e9cd2f82b8f 100644 (file)
--- a/affinity/api/pom.xml
+++ b/affinity/api/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>affinity</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml
index bc804fdd767168ee847890866f0a177b37d2792b..f6e6336ef109f65474e2c8936ff4abd0ed2e47e0 100644 (file)
--- a/affinity/implementation/pom.xml
+++ b/affinity/implementation/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>affinity.implementation</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -36,7 +36,7 @@
             <Import-Package>
               org.opendaylight.affinity.affinity,
               org.opendaylight.affinity.l2agent,
-              org.opendaylight.affinity.nfchainagent,
+              org.opendaylight.affinity.nfchainagent, 
               org.opendaylight.controller.clustering.services,
               org.opendaylight.controller.configuration,
               org.opendaylight.controller.hosttracker,
@@ -123,17 +123,17 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>l2agent</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>nfchainagent</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

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 0a380f2ebef3dc1c84c9387abf1e33228deda656..2c7d1d6f93af0f6ee9c7834d853108f1661d5209 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
@@ -106,7 +106,7 @@ public class Activator extends ComponentActivatorAbstractBase {
                   .setRequired(true));
             c.add(createContainerServiceDependency(containerName).setService(
                     NFchainAgent.class).setCallbacks(
-                    "setNfchainAgent", "unsetNfchainAgent")
+                    "setNFchainAgent", "unsetNFchainAgent")
                     .setRequired(true));
             c.add(createContainerServiceDependency(containerName)
                   .setService(IFlowProgrammerService.class)

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 4bd43c50b41e67d21712582579d23d5f65dbb523..00505ad1891e140a854c6c0b37883378c64e6db4 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
@@ -683,6 +683,7 @@ public class AffinityManagerImpl implements IAffinityManager, IfNewHostNotify,
         String key = al.getName();
         nfclist.add(nfcc);
         nfchainagent.addNfchain(key, nfclist);
+        log.info("Added nfchain {}", al.getName());
         return new Status(StatusCode.SUCCESS);
     }
 

diff --git a/affinity/integrationtest/pom.xml b/affinity/integrationtest/pom.xml
index 4064015f5539be4ba27e69c6a572314868e7ce3b..54e1fc8f06d2c06ca444d78b3c69c7b3dff7b8c7 100644 (file)
--- a/affinity/integrationtest/pom.xml
+++ b/affinity/integrationtest/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>affinity.integrationtest</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity.implementation</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/affinity/northbound/pom.xml b/affinity/northbound/pom.xml
index 85fbbc24179ce1e4b3862acaf55a14939589f3ce..7b1d0b154f6a79349e9702b81615dd54d81a0aff 100644 (file)
--- a/affinity/northbound/pom.xml
+++ b/affinity/northbound/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.opendaylight.affinity</groupId> 
   <artifactId>affinity.northbound</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
index 5b073748d6f814c622f533a06d160c2aa2c00032..6dce287bdbcacebeb716b942768e69990b3af6be 100644 (file)
--- a/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
+++ b/affinity/northbound/src/main/java/org/opendaylight/affinity/affinity/northbound/AffinityNorthbound.java
@@ -275,6 +275,7 @@ public class AffinityNorthbound {
         AffinityLink al1 = affinityManager.getAffinityLink(affinityLinkName);
         al1.setWaypoint(waypointIP);
         try {
+            affinityManager.addNfchain(al1);
             affinityManager.enableRedirect(al1);
         } catch (Exception e) {
             String message = "An error occurred during flow programming.";

diff --git a/analytics/api/pom.xml b/analytics/api/pom.xml
index 1f144a0b85646bd2a04a7710ea017c7cfa8a73b4..b61c325cb8219ce84d653c1c3df573c8f4d97282 100644 (file)
--- a/analytics/api/pom.xml
+++ b/analytics/api/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
 
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/analytics/implementation/pom.xml b/analytics/implementation/pom.xml
index 815a30e8bd478d9e058ba82a91c9a0f24e2c2880..479d340c772f3281d0bfe88f99afe8c9557f69af 100644 (file)
--- a/analytics/implementation/pom.xml
+++ b/analytics/implementation/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics.implementation</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
@@ -164,12 +164,12 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/analytics/integrationtest/pom.xml b/analytics/integrationtest/pom.xml
index 802b3acb9f26c2b1c4c41cfa4554ac446af13461..4c6217d90a7730d42b0dc58b51bd6e1a9848cad6 100644 (file)
--- a/analytics/integrationtest/pom.xml
+++ b/analytics/integrationtest/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics.integrationtest</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
 
   <build>
     <pluginManagement>
@@ -98,22 +98,22 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity.implementation</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics.implementation</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/analytics/northbound/pom.xml b/analytics/northbound/pom.xml
index ff1266f7c2142e8a14618f025feadf26cdfe8792..b80329dc4a859b9c854192cd2c42b5ff454015de 100644 (file)
--- a/analytics/northbound/pom.xml
+++ b/analytics/northbound/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>analytics.northbound</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -69,12 +69,12 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>analytics</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/l2agent/pom.xml b/l2agent/pom.xml
index 339817ff3b8667dfa905a1fcfd516822d43b8fa8..4cdd22ca76c911f83bb018dee3e52128a2895dba 100644 (file)
--- a/l2agent/pom.xml
+++ b/l2agent/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>l2agent</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/nfchain/api/pom.xml b/nfchain/api/pom.xml
index 5d04b89445c5159ac18957314b9233b052e03723..a5f16790d92d37d188f52c539e350cb39c9cb75c 100644 (file)
--- a/nfchain/api/pom.xml
+++ b/nfchain/api/pom.xml
@@ -11,7 +11,7 @@
     
     <groupId>org.opendaylight.affinity</groupId>
     <artifactId>nfchain</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
   
     <scm>

diff --git a/nfchain/impl/pom.xml b/nfchain/impl/pom.xml
index 955609fa45ef2f52b8fe71cf081a707e82f36660..f9c95a7e4b975c41b7a3e17242a0523f55d0cc25 100644 (file)
--- a/nfchain/impl/pom.xml
+++ b/nfchain/impl/pom.xml
@@ -12,7 +12,7 @@
     
     <groupId>org.opendaylight.affinity</groupId>
     <artifactId>nfchain-impl</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
   
     <scm>

diff --git a/nfchainagent/pom.xml b/nfchainagent/pom.xml
index 1fb787b3c5b7278e3dcfc9e90b70eb0ef873b79a..a1160370a823d3cb5140ae7c61d4949fad861739 100644 (file)
--- a/nfchainagent/pom.xml
+++ b/nfchainagent/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>org.opendaylight.affinity</groupId>
   <artifactId>nfchainagent</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+  <version>0.4.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -73,12 +73,12 @@
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>l2agent</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.affinity</groupId>
       <artifactId>affinity</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>0.4.1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/nfchainagent/src/main/java/org/opendaylight/affinity/nfchainagent/Activator.java b/nfchainagent/src/main/java/org/opendaylight/affinity/nfchainagent/Activator.java
index 2cfa61a3183f3b512c0873eea8a6a736c08418ce..ce95957289805d31ae1fdd0f4ec0832e6a961f02 100644 (file)
--- a/nfchainagent/src/main/java/org/opendaylight/affinity/nfchainagent/Activator.java
+++ b/nfchainagent/src/main/java/org/opendaylight/affinity/nfchainagent/Activator.java
@@ -22,6 +22,7 @@ import org.opendaylight.controller.sal.packet.IDataPacketService;
 import org.opendaylight.controller.sal.flowprogrammer.IFlowProgrammerService;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
 
+import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.affinity.l2agent.IfL2Agent;
 import org.opendaylight.controller.sal.flowprogrammer.IFlowProgrammerService;
 //import org.opendaylight.controller.forwardingrulesmanager.IForwardingRulesManager;
@@ -81,14 +82,15 @@ public class Activator extends ComponentActivatorAbstractBase {
             // export the services
             Dictionary<String, String> props = new Hashtable<String, String>();
             props.put("salListenerName", "NFchainAgent");
-            c.setInterface(new String[] { IListenDataPacket.class.getName(),                    
-                                          NFchainAgent.class.getName() }, props);
+            c.setInterface(new String[] { NFchainAgent.class.getName() }, props);
 
             // register dependent modules
             c.add(createContainerServiceDependency(containerName)
                   .setService(IfL2Agent.class)
                   .setCallbacks("setL2Agent", "unsetL2Agent")
                   .setRequired(true));
+            c.add(createContainerServiceDependency(containerName).setService(IfIptoHost.class)
+                  .setCallbacks("setHostTracker", "unsetHostTracker").setRequired(true));
 
             c.add(createContainerServiceDependency(containerName).setService(
                     ISwitchManager.class).setCallbacks("setSwitchManager",

diff --git a/pom.xml b/pom.xml
index 6c032e525469571c32771fa0ce36de3a97ea97c2..6ef738b5846ea2438c5084fb23f888adc4115b36 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -126,14 +126,14 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.10</version>
+        <version>4.11</version>
         <scope>test</scope>
         <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>1.7.2</version>
+        <version>1.7.5</version>
       </dependency>
     </dependencies>