*/
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.config.api.osgi.WaitingServiceTracker;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-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;
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.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;
import org.slf4j.LoggerFactory;
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();
+ }
+ }
});
}
@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,
}
@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,
}
@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);
}
@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(DataBroker broker, String rd, String macAddress, String prefix,
- List<String> nextHopList, VrfEntry.EncapType encapType, long label,
- long l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin,
- WriteTransaction writeConfigTxn) {
+ public void addOrUpdateFibEntry(String rd, String macAddress, String prefix,
+ 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);
}
@Override
- public void addFibEntryForRouterInterface(DataBroker broker, String rd, String prefix,
- RouterInterface routerInterface, long label,
- WriteTransaction writeConfigTxn) {
+ public void addFibEntryForRouterInterface(String rd, String prefix,
+ RouterInterface routerInterface, Uint32 label,
+ TypedWriteTransaction<Configuration> writeConfigTxn) {
fibUtil.addFibEntryForRouterInterface(rd, prefix, routerInterface, label, writeConfigTxn);
}
@Override
- public void removeOrUpdateFibEntry(DataBroker broker, String rd, String prefix,
- String nextHopToRemove, WriteTransaction writeConfigTxn) {
+ public void removeOrUpdateFibEntry(String rd, String prefix,
+ String nextHopToRemove, TypedWriteTransaction<Configuration> writeConfigTxn) {
fibUtil.removeOrUpdateFibEntry(rd, prefix, nextHopToRemove, writeConfigTxn);
}
@Override
- public void removeFibEntry(DataBroker broker, String rd, String prefix, WriteTransaction 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(DataBroker broker, String rd, String prefix, String nextHop,
- long label, boolean nextHopAdd, WriteTransaction writeConfigTxn) {
+ public void updateRoutePathForFibEntry(String rd, String prefix, String nextHop,
+ Uint32 label, boolean nextHopAdd, TypedWriteTransaction<Configuration> writeConfigTxn) {
fibUtil.updateRoutePathForFibEntry(rd, prefix, nextHop, label, nextHopAdd, writeConfigTxn);
}
@Override
- public void removeVrfTable(DataBroker broker, String rd, WriteTransaction writeConfigTxn) {
+ public void removeVrfTable(String rd, TypedWriteTransaction<Configuration> writeConfigTxn) {
fibUtil.removeVrfTable(rd, writeConfigTxn);
}
+ @Override
+ public void addVrfTable(String rd, WriteTransaction writeConfigTxn) {
+ fibUtil.addVrfTable(rd, writeConfigTxn);
+ }
+
@Override
public boolean isVPNConfigured() {
return this.vpnmanager.isVPNConfigured();
}
@Override
- public void programDcGwLoadBalancingGroup(List<String> availableDcGws, BigInteger dpnId,
- String destinationIp, int addRemoveOrUpdate, boolean isTunnelUp) {
- nexthopManager.programDcGwLoadBalancingGroup(availableDcGws, dpnId, destinationIp,
- addRemoveOrUpdate, isTunnelUp);
+ 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(dpnId, destinationIp,
+ addRemoveOrUpdate, isTunnelUp, tunnelType);
}
@Override
Code Review / netvirt.git / blobdiff