Upstreaming changes in Netvirt

[netvirt.git] / vpnservice / natservice / natservice-impl / src / main / java / org / opendaylight / netvirt / natservice / internal / NatServiceProvider.java

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceProvider.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceProvider.java
index 50667e5a788af0c1f2636bdee2747ed22353ac32..bc039aa03062038eb97ddc0dc13f41a1ff86e462 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceProvider.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatServiceProvider.java
@@ -14,6 +14,7 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
+import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
@@ -51,6 +52,7 @@ public class NatServiceProvider implements BindingAwareProvider, AutoCloseable {
     private NAPTSwitchSelector naptSwitchSelector;
     private RouterPortsListener routerPortsListener;
     private IInterfaceManager interfaceManager;
+    private IFibManager fibManager;
 
     public NatServiceProvider(RpcProviderRegistry rpcProviderRegistry) {
         this.rpcProviderRegistry = rpcProviderRegistry;
@@ -69,6 +71,11 @@ public class NatServiceProvider implements BindingAwareProvider, AutoCloseable {
         this.bgpManager = bgpManager;
     }
 
+    public void setFibManager(IFibManager fibManager) {
+        LOG.debug("FIB Manager reference initialized");
+        this.fibManager = fibManager;
+    }
+
     public void setInterfaceManager(IInterfaceManager interfaceManager) {
         this.interfaceManager = interfaceManager;
     }
@@ -128,6 +135,7 @@ public class NatServiceProvider implements BindingAwareProvider, AutoCloseable {
             VpnFloatingIpHandler handler = new VpnFloatingIpHandler(vpnService, bgpManager, fibService);
             handler.setBroker(dataBroker);
             handler.setMdsalManager(mdsalManager);
+            handler.setFibManager(fibManager);
             handler.setListener(floatingIpListener);
             floatingIpListener.setFloatingIpHandler(handler);
 
@@ -148,6 +156,7 @@ public class NatServiceProvider implements BindingAwareProvider, AutoCloseable {
             externalRouterListener.setNaptSwitchSelector(naptSwitchSelector);
             externalRouterListener.setNaptEventHandler(naptEventHandler);
             externalRouterListener.setNaptPacketInHandler(naptPacketInHandler);
+            externalRouterListener.setFibManager(fibManager);
 
             //Instantiate ExternalNetworksChangeListener and set the dataBroker in it.
             externalNetworksChangeListener = new ExternalNetworksChangeListener( dataBroker );