From 98ceae54b5deabbddff2e76e5d4df67dd0cf96c8 Mon Sep 17 00:00:00 2001 From: Suchi Raman Date: Tue, 29 Oct 2013 13:47:05 -0400 Subject: [PATCH] Fixes to make path redirect affinity work using the new nfchainagent service. Signed-off-by: Suchi Raman --- affinity/api/pom.xml | 2 +- affinity/implementation/pom.xml | 10 +++++----- .../affinity/affinity/internal/Activator.java | 2 +- .../affinity/internal/AffinityManagerImpl.java | 1 + affinity/integrationtest/pom.xml | 6 +++--- affinity/northbound/pom.xml | 4 ++-- .../affinity/northbound/AffinityNorthbound.java | 1 + analytics/api/pom.xml | 4 ++-- analytics/implementation/pom.xml | 6 +++--- analytics/integrationtest/pom.xml | 10 +++++----- analytics/northbound/pom.xml | 6 +++--- l2agent/pom.xml | 2 +- nfchain/api/pom.xml | 2 +- nfchain/impl/pom.xml | 2 +- nfchainagent/pom.xml | 6 +++--- .../opendaylight/affinity/nfchainagent/Activator.java | 6 ++++-- pom.xml | 4 ++-- 17 files changed, 39 insertions(+), 35 deletions(-) diff --git a/affinity/api/pom.xml b/affinity/api/pom.xml index 2567728..922421a 100644 --- a/affinity/api/pom.xml +++ b/affinity/api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle diff --git a/affinity/implementation/pom.xml b/affinity/implementation/pom.xml index bc804fd..f6e6336 100644 --- a/affinity/implementation/pom.xml +++ b/affinity/implementation/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity affinity.implementation - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle @@ -36,7 +36,7 @@ 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 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity l2agent - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity nfchainagent - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT 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 0a380f2..2c7d1d6 100644 --- 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 4bd43c5..00505ad 100644 --- 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 4064015..54e1fc8 100644 --- a/affinity/integrationtest/pom.xml +++ b/affinity/integrationtest/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.affinity affinity.integrationtest - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT @@ -49,12 +49,12 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity affinity.implementation - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/affinity/northbound/pom.xml b/affinity/northbound/pom.xml index 85fbbc2..7b1d0b1 100644 --- a/affinity/northbound/pom.xml +++ b/affinity/northbound/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.affinity affinity.northbound - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle @@ -77,7 +77,7 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller 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 5b07374..6dce287 100644 --- 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 1f144a0..b61c325 100644 --- a/analytics/api/pom.xml +++ b/analytics/api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity analytics - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT scm:git:ssh://git.opendaylight.org:29418/controller.git @@ -48,7 +48,7 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/analytics/implementation/pom.xml b/analytics/implementation/pom.xml index 815a30e..479d340 100644 --- a/analytics/implementation/pom.xml +++ b/analytics/implementation/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity analytics.implementation - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle @@ -164,12 +164,12 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity analytics - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/analytics/integrationtest/pom.xml b/analytics/integrationtest/pom.xml index 802b3ac..4c6217d 100644 --- a/analytics/integrationtest/pom.xml +++ b/analytics/integrationtest/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity analytics.integrationtest - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT @@ -98,22 +98,22 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity affinity.implementation - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity analytics - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity analytics.implementation - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/analytics/northbound/pom.xml b/analytics/northbound/pom.xml index ff1266f..b80329d 100644 --- a/analytics/northbound/pom.xml +++ b/analytics/northbound/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.affinity analytics.northbound - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle @@ -69,12 +69,12 @@ org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity analytics - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.controller diff --git a/l2agent/pom.xml b/l2agent/pom.xml index 339817f..4cdd22c 100644 --- a/l2agent/pom.xml +++ b/l2agent/pom.xml @@ -11,7 +11,7 @@ l2agent - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle diff --git a/nfchain/api/pom.xml b/nfchain/api/pom.xml index 5d04b89..a5f1679 100644 --- a/nfchain/api/pom.xml +++ b/nfchain/api/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.affinity nfchain - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle diff --git a/nfchain/impl/pom.xml b/nfchain/impl/pom.xml index 955609f..f9c95a7 100644 --- a/nfchain/impl/pom.xml +++ b/nfchain/impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.affinity nfchain-impl - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle diff --git a/nfchainagent/pom.xml b/nfchainagent/pom.xml index 1fb787b..a116037 100644 --- a/nfchainagent/pom.xml +++ b/nfchainagent/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.affinity nfchainagent - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle @@ -73,12 +73,12 @@ org.opendaylight.affinity l2agent - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT org.opendaylight.affinity affinity - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT 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 2cfa61a..ce95957 100644 --- 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 props = new Hashtable(); 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 6c032e5..6ef738b 100644 --- a/pom.xml +++ b/pom.xml @@ -126,14 +126,14 @@ junit junit - 4.10 + 4.11 test true org.slf4j slf4j-simple - 1.7.2 + 1.7.5 -- 2.36.6