ECMP UC2 Enhancement: Support for more than two DC-GWs

[netvirt.git] / fibmanager / impl / src / main / java / org / opendaylight / netvirt / fibmanager / FibManagerImpl.java

diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java
index cd4beb335ca2b5d5239629ec7ee7f7861d790e64..91d6f84b44f0788b9ee92de93fdef06061e22365 100755 (executable)
--- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java
+++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java
@@ -8,22 +8,27 @@
 package org.opendaylight.netvirt.fibmanager;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import java.math.BigInteger;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.genius.infra.Datastore.Configuration;
+import org.opendaylight.genius.infra.TypedWriteTransaction;
 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 import org.opendaylight.netvirt.fibmanager.api.RouteOrigin;
 import org.opendaylight.netvirt.vpnmanager.api.IVpnManager;
 import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkCache;
 import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkDataComposite;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.RouterInterface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry;
 import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,10 +53,20 @@ public class FibManagerImpl implements IFibManager {
         this.interVpnLinkCache = interVpnLinkCache;
 
         GlobalEventExecutor.INSTANCE.execute(() -> {
-            final WaitingServiceTracker<IVpnManager> tracker = WaitingServiceTracker.create(
-                IVpnManager.class, bundleContext);
-            vpnmanager = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
-            LOG.info("FibManagerImpl initialized. IVpnManager={}", vpnmanager);
+            ServiceTracker<IVpnManager, ?> tracker = null;
+            try {
+                tracker = new ServiceTracker<>(bundleContext, IVpnManager.class, null);
+                tracker.open();
+                vpnmanager = (IVpnManager) tracker.waitForService(TimeUnit.MILLISECONDS.convert(5, TimeUnit.MINUTES));
+                Preconditions.checkState(vpnmanager != null, "IVpnManager service not found");
+                LOG.info("FibManagerImpl initialized. IVpnManager={}", vpnmanager);
+            } catch (IllegalStateException | InterruptedException e) {
+                LOG.error("Error retrieving IVpnManager service", e);
+            } finally {
+                if (tracker != null) {
+                    tracker.close();
+                }
+            }
         });
     }
 
@@ -123,7 +138,7 @@ public class FibManagerImpl implements IFibManager {
     public void addOrUpdateFibEntry(String rd, String macAddress, String prefix,
             List<String> nextHopList, VrfEntry.EncapType encapType, long label,
             long l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin,
-            WriteTransaction writeConfigTxn) {
+            TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.addOrUpdateFibEntry(rd, macAddress, prefix, nextHopList , encapType, label, l3vni, gwMacAddress,
                 parentVpnRd, origin, writeConfigTxn);
     }
@@ -131,18 +146,18 @@ public class FibManagerImpl implements IFibManager {
     @Override
     public void addFibEntryForRouterInterface(String rd, String prefix,
             RouterInterface routerInterface, long label,
-            WriteTransaction writeConfigTxn) {
+            TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.addFibEntryForRouterInterface(rd, prefix, routerInterface, label, writeConfigTxn);
     }
 
     @Override
     public void removeOrUpdateFibEntry(String rd, String prefix,
-            String nextHopToRemove, WriteTransaction writeConfigTxn) {
+            String nextHopToRemove, TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.removeOrUpdateFibEntry(rd, prefix, nextHopToRemove, writeConfigTxn);
     }
 
     @Override
-    public void removeFibEntry(String rd, String prefix, WriteTransaction writeConfigTxn) {
+    public void removeFibEntry(String rd, String prefix, TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.removeFibEntry(rd, prefix, writeConfigTxn);
     }
 
@@ -153,7 +168,7 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void removeVrfTable(String rd, WriteTransaction writeConfigTxn) {
+    public void removeVrfTable(String rd, TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.removeVrfTable(rd, writeConfigTxn);
     }
 
@@ -185,10 +200,11 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void programDcGwLoadBalancingGroup(List<String> availableDcGws, BigInteger dpnId,
-            String destinationIp, int addRemoveOrUpdate, boolean isTunnelUp) {
-        nexthopManager.programDcGwLoadBalancingGroup(availableDcGws, dpnId, destinationIp,
-            addRemoveOrUpdate, isTunnelUp);
+    public void programDcGwLoadBalancingGroup(BigInteger dpnId, String destinationIp,
+                                              int addRemoveOrUpdate, boolean isTunnelUp,
+                                              Class<? extends TunnelTypeBase> tunnelType) {
+        nexthopManager.programDcGwLoadBalancingGroup(dpnId, destinationIp,
+            addRemoveOrUpdate, isTunnelUp, tunnelType);
     }
 
     @Override