NETVIRT-1630 migrate to md-sal APIs

[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 0d1515cc149011272bdc5c89b5f6a3eca31631bc..6a139bd54d56358881146a485dfbb6405c147ad5 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
@@ -7,18 +7,18 @@
  */
 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.Optional;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-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.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.netvirt.fibmanager.api.IFibManager;
 import org.opendaylight.netvirt.fibmanager.api.RouteOrigin;
 import org.opendaylight.netvirt.vpnmanager.api.IVpnManager;
@@ -27,6 +27,8 @@ import org.opendaylight.netvirt.vpnmanager.api.intervpnlink.InterVpnLinkDataComp
 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.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
@@ -71,13 +73,13 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void populateFibOnNewDpn(BigInteger dpnId, long vpnId, String rd,
+    public void populateFibOnNewDpn(Uint64 dpnId, Uint32 vpnId, String rd,
                                     FutureCallback<List<Void>> callback) {
         vrfEntryListener.populateFibOnNewDpn(dpnId, vpnId, rd, callback);
     }
 
     @Override
-    public void populateExternalRoutesOnDpn(BigInteger localDpnId, long vpnId,
+    public void populateExternalRoutesOnDpn(Uint64 localDpnId, Uint32 vpnId,
                                             String rd, String localNextHopIp,
                                             String remoteNextHopIp) {
         vrfEntryListener.populateExternalRoutesOnDpn(localDpnId, vpnId, rd,
@@ -85,7 +87,7 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void cleanUpExternalRoutesOnDpn(BigInteger dpnId, long vpnId,
+    public void cleanUpExternalRoutesOnDpn(Uint64 dpnId, Uint32 vpnId,
                                            String rd, String localNextHopIp,
                                            String remoteNextHopIp) {
         vrfEntryListener.cleanUpExternalRoutesOnDpn(dpnId, vpnId, rd,
@@ -93,7 +95,7 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void cleanUpDpnForVpn(BigInteger dpnId, long vpnId, String rd,
+    public void cleanUpDpnForVpn(Uint64 dpnId, Uint32 vpnId, String rd,
                                  FutureCallback<List<Void>> callback) {
         vrfEntryListener.cleanUpDpnForVpn(dpnId, vpnId, rd, callback);
     }
@@ -125,19 +127,19 @@ public class FibManagerImpl implements IFibManager {
 
     @Override
     public void manageRemoteRouteOnDPN(boolean action,
-                                       BigInteger dpnId,
-                                       long vpnId,
+                                       Uint64 dpnId,
+                                       Uint32 vpnId,
                                        String rd,
                                        String destPrefix,
                                        String destTepIp,
-                                       long label) {
+                                       Uint32 label) {
         vrfEntryListener.manageRemoteRouteOnDPN(action, dpnId, vpnId, rd, destPrefix, destTepIp, label);
     }
 
     @Override
     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,
+            List<String> nextHopList, VrfEntry.EncapType encapType, Uint32 label,
+            Uint32 l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin,
             TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.addOrUpdateFibEntry(rd, macAddress, prefix, nextHopList , encapType, label, l3vni, gwMacAddress,
                 parentVpnRd, origin, writeConfigTxn);
@@ -145,7 +147,7 @@ public class FibManagerImpl implements IFibManager {
 
     @Override
     public void addFibEntryForRouterInterface(String rd, String prefix,
-            RouterInterface routerInterface, long label,
+            RouterInterface routerInterface, Uint32 label,
             TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.addFibEntryForRouterInterface(rd, prefix, routerInterface, label, writeConfigTxn);
     }
@@ -157,13 +159,14 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void removeFibEntry(String rd, String prefix, TypedWriteTransaction<Configuration> writeConfigTxn) {
-        fibUtil.removeFibEntry(rd, prefix, writeConfigTxn);
+    public void removeFibEntry(String rd, String prefix, String eventSource,
+                               TypedWriteTransaction<Configuration> writeConfigTxn) {
+        fibUtil.removeFibEntry(rd, prefix, eventSource, writeConfigTxn);
     }
 
     @Override
     public void updateRoutePathForFibEntry(String rd, String prefix, String nextHop,
-            long label, boolean nextHopAdd, WriteTransaction writeConfigTxn) {
+            Uint32 label, boolean nextHopAdd, TypedWriteTransaction<Configuration> writeConfigTxn) {
         fibUtil.updateRoutePathForFibEntry(rd, prefix, nextHop, label, nextHopAdd, writeConfigTxn);
     }
 
@@ -200,10 +203,15 @@ public class FibManagerImpl implements IFibManager {
     }
 
     @Override
-    public void programDcGwLoadBalancingGroup(List<String> availableDcGws, BigInteger dpnId, String destinationIp,
+    public boolean checkFibEntryExist(DataBroker broker, String rd, String prefix, String nextHopIp) {
+        return fibUtil.checkFibEntryExist(broker, rd, prefix, nextHopIp);
+    }
+
+    @Override
+    public void programDcGwLoadBalancingGroup(Uint64 dpnId, String destinationIp,
                                               int addRemoveOrUpdate, boolean isTunnelUp,
                                               Class<? extends TunnelTypeBase> tunnelType) {
-        nexthopManager.programDcGwLoadBalancingGroup(availableDcGws, dpnId, destinationIp,
+        nexthopManager.programDcGwLoadBalancingGroup(dpnId, destinationIp,
             addRemoveOrUpdate, isTunnelUp, tunnelType);
     }