*/
package org.opendaylight.netvirt.vpnmanager;
-import com.google.common.base.Optional;
+import static java.util.Collections.emptyList;
+
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.annotation.PostConstruct;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.locks.ReentrantLock;
+import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
import org.opendaylight.genius.infra.Datastore;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.genius.utils.JvmGlobalLocks;
import org.opendaylight.genius.utils.SystemPropertyReader;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
import org.opendaylight.netvirt.fibmanager.api.IFibManager;
import org.opendaylight.netvirt.vpnmanager.api.VpnExtraRouteHelper;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.AddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3nexthop.rev150409.L3nexthop;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.op.data.vpn.instance.op.data.entry.vpntargets.VpnTarget;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroutes.Vpn;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
-public class VpnOpStatusListener extends AsyncDataTreeChangeListenerBase<VpnInstanceOpDataEntry, VpnOpStatusListener> {
+public class VpnOpStatusListener extends AbstractAsyncDataTreeChangeListener<VpnInstanceOpDataEntry> {
private static final Logger LOG = LoggerFactory.getLogger(VpnOpStatusListener.class);
private final DataBroker dataBroker;
private final ManagedNewTransactionRunner txRunner;
final IdManagerService idManager, final IFibManager fibManager,
final IMdsalApiManager mdsalManager, final VpnFootprintService vpnFootprintService,
final JobCoordinator jobCoordinator, VpnUtil vpnUtil) {
- super(VpnInstanceOpDataEntry.class, VpnOpStatusListener.class);
+ super(dataBroker, LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(VpnInstanceOpData.class)
+ .child(VpnInstanceOpDataEntry.class), Executors
+ .newListeningSingleThreadExecutor("VpnOpStatusListener", LOG));
this.dataBroker = dataBroker;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
this.bgpManager = bgpManager;
this.vpnFootprintService = vpnFootprintService;
this.jobCoordinator = jobCoordinator;
this.vpnUtil = vpnUtil;
+ start();
}
- @PostConstruct
public void start() {
LOG.info("{} start", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.OPERATIONAL, dataBroker);
}
@Override
- protected InstanceIdentifier<VpnInstanceOpDataEntry> getWildCardPath() {
- return InstanceIdentifier.create(VpnInstanceOpData.class).child(VpnInstanceOpDataEntry.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
- @Override
- protected VpnOpStatusListener getDataTreeChangeListener() {
- return VpnOpStatusListener.this;
- }
@Override
- protected void remove(InstanceIdentifier<VpnInstanceOpDataEntry> identifier, VpnInstanceOpDataEntry value) {
+ public void remove(InstanceIdentifier<VpnInstanceOpDataEntry> identifier, VpnInstanceOpDataEntry value) {
LOG.info("remove: Ignoring vpn Op {} with rd {}", value.getVpnInstanceName(), value.getVrfId());
}
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- protected void update(InstanceIdentifier<VpnInstanceOpDataEntry> identifier,
+ public void update(InstanceIdentifier<VpnInstanceOpDataEntry> identifier,
VpnInstanceOpDataEntry original, VpnInstanceOpDataEntry update) {
LOG.info("update: Processing update for vpn {} with rd {}", update.getVpnInstanceName(), update.getVrfId());
if (update.getVpnState() == VpnInstanceOpDataEntry.VpnState.PendingDelete
final String vpnName = update.getVpnInstanceName();
final List<String> rds = update.getRd();
String primaryRd = update.getVrfId();
- final long vpnId = vpnUtil.getVpnId(vpnName);
+ final Uint32 vpnId = vpnUtil.getVpnId(vpnName);
jobCoordinator.enqueueJob("VPN-" + update.getVpnInstanceName(), () -> {
// Two transactions are used, one for operational, one for config; we only submit the config
// transaction if the operational transaction succeeds
ListenableFuture<Void> operationalFuture = txRunner.callWithNewWriteOnlyTransactionAndSubmit(
Datastore.OPERATIONAL, operTx -> {
// Clean up VPNExtraRoutes Operational DS
- if (VpnUtil.isBgpVpn(vpnName, primaryRd)) {
+ if (rds != null && VpnUtil.isBgpVpn(vpnName, primaryRd)) {
if (update.getType() == VpnInstanceOpDataEntry.Type.L2) {
rds.parallelStream().forEach(rd -> bgpManager.deleteVrf(
rd, false, AddressFamily.L2VPN));
}
- if (update.isIpv4Configured()) {
+ if (update.getIpAddressFamilyConfigured()
+ == VpnInstanceOpDataEntry.IpAddressFamilyConfigured.Ipv4) {
rds.parallelStream().forEach(rd -> bgpManager.deleteVrf(
rd, false, AddressFamily.IPV4));
}
- if (update.isIpv6Configured()) {
+ if (update.getIpAddressFamilyConfigured()
+ == VpnInstanceOpDataEntry.IpAddressFamilyConfigured.Ipv6) {
rds.parallelStream().forEach(rd -> bgpManager.deleteVrf(
rd, false, AddressFamily.IPV6));
}
+ if (update.getIpAddressFamilyConfigured()
+ == VpnInstanceOpDataEntry.IpAddressFamilyConfigured.Ipv4AndIpv6) {
+ rds.parallelStream()
+ .forEach(rd -> bgpManager.deleteVrf(
+ rd, false, AddressFamily.IPV4));
+ rds.parallelStream()
+ .forEach(rd -> bgpManager.deleteVrf(
+ rd, false, AddressFamily.IPV6));
+ }
}
InstanceIdentifier<Vpn> vpnToExtraroute =
VpnExtraRouteHelper.getVpnToExtrarouteVpnIdentifier(vpnName);
- Optional<Vpn> optVpnToExtraroute = Optional.absent();
+ Optional<Vpn> optVpnToExtraroute = Optional.empty();
try {
optVpnToExtraroute = SingleTransactionDataBroker.syncReadOptional(dataBroker,
LogicalDatastoreType.OPERATIONAL, vpnToExtraroute);
- } catch (ReadFailedException e) {
+ } catch (InterruptedException | ExecutionException e) {
LOG.error("update: Failed to read VpnToExtraRoute for vpn {}", vpnName);
}
if (optVpnToExtraroute.isPresent()) {
vpnUtil.removeExternalTunnelDemuxFlows(vpnName);
}
// Clean up PrefixToInterface Operational DS
- Optional<VpnIds> optPrefixToIntf = Optional.absent();
+ Optional<VpnIds> optPrefixToIntf = Optional.empty();
try {
optPrefixToIntf = SingleTransactionDataBroker.syncReadOptional(dataBroker,
LogicalDatastoreType.OPERATIONAL, VpnUtil.getPrefixToInterfaceIdentifier(vpnId));
- } catch (ReadFailedException e) {
+ } catch (InterruptedException | ExecutionException e) {
LOG.error("update: Failed to read PrefixToInterface for vpn {}", vpnName);
}
if (optPrefixToIntf.isPresent()) {
// Clean up L3NextHop Operational DS
InstanceIdentifier<VpnNexthops> vpnNextHops = InstanceIdentifier.builder(L3nexthop.class).child(
VpnNexthops.class, new VpnNexthopsKey(vpnId)).build();
- Optional<VpnNexthops> optL3nexthopForVpnId = Optional.absent();
+ Optional<VpnNexthops> optL3nexthopForVpnId = Optional.empty();
try {
optL3nexthopForVpnId = SingleTransactionDataBroker.syncReadOptional(dataBroker,
LogicalDatastoreType.OPERATIONAL, vpnNextHops);
- } catch (ReadFailedException e) {
+ } catch (InterruptedException | ExecutionException e) {
LOG.error("update: Failed to read VpnNextHops for vpn {}", vpnName);
}
if (optL3nexthopForVpnId.isPresent()) {
LOG.trace("Removed vpnIdentifier for rd{} vpnname {}", primaryRd, vpnName);
// Clean up FIB Entries Config DS
- synchronized (vpnName.intern()) {
+ // FIXME: separate out to somehow?
+ final ReentrantLock lock = JvmGlobalLocks.getLockForString(vpnName);
+ lock.lock();
+ try {
fibManager.removeVrfTable(primaryRd, confTx);
+ } finally {
+ lock.unlock();
}
}), new VpnOpStatusListener.PostDeleteVpnInstanceWorker(vpnName),
MoreExecutors.directExecutor());
}
jobCoordinator.enqueueJob("VPN-" + update.getVpnInstanceName(), () -> {
//RD update case get only updated RD list
- List<String> rds = update.getRd();
- if (original.getRd().size() != update.getRd().size()) {
- List<String> oldRds = original.getRd();
- rds.removeAll(oldRds);
+ List<String> rds = update.getRd() != null ? new ArrayList<>(update.getRd()) : new ArrayList<>();
+ if (original.getRd() != null && original.getRd().size() != rds.size()) {
+ rds.removeAll(original.getRd());
}
rds.parallelStream().forEach(rd -> {
try {
- List<String> importRTList = rd.equals(primaryRd) ? irtList : Collections.emptyList();
+ List<String> importRTList = rd.equals(primaryRd) ? irtList : emptyList();
LOG.info("VpnOpStatusListener.update: updating BGPVPN for vpn {} with RD {}"
- + " Type is {}, IPv4 is {}, IPv6 is {}, iRT {}", vpnName, primaryRd, update.getType(),
- update.isIpv4Configured(), update.isIpv6Configured(), importRTList);
- if (update.getType() == VpnInstanceOpDataEntry.Type.L2) {
- bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.L2VPN);
- }
- if (!original.isIpv4Configured() && update.isIpv4Configured()) {
- bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV4);
- } else if (original.isIpv4Configured() && !update.isIpv4Configured()) {
- bgpManager.deleteVrf(rd, false, AddressFamily.IPV4);
- }
- if (!original.isIpv6Configured() && update.isIpv6Configured()) {
- bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV6);
- } else if (original.isIpv6Configured() && !update.isIpv6Configured()) {
- bgpManager.deleteVrf(rd, false, AddressFamily.IPV6);
+ + " Type is {}, IPtype is {}, iRT {}", vpnName, primaryRd, update.getType(),
+ update.getIpAddressFamilyConfigured(), importRTList);
+ int ipValue = VpnUtil.getIpFamilyValueToRemove(original,update);
+ switch (ipValue) {
+ case 4:
+ bgpManager.deleteVrf(rd, false, AddressFamily.IPV4);
+ break;
+ case 6:
+ bgpManager.deleteVrf(rd, false, AddressFamily.IPV6);
+ break;
+ case 10:
+ bgpManager.deleteVrf(rd, false, AddressFamily.IPV4);
+ bgpManager.deleteVrf(rd, false, AddressFamily.IPV6);
+ break;
+ default:
+ break;
}
/* Update vrf entry with newly added RD list. VPN does not support for
* deleting existing RDs
*/
if (original.getRd().size() != update.getRd().size()) {
- if (update.isIpv4Configured()) {
- bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV4);
- }
- if (update.isIpv6Configured()) {
- bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV6);
+ ipValue = VpnUtil.getIpFamilyValueToAdd(original,update);
+ switch (ipValue) {
+ case 4:
+ bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV4);
+ break;
+ case 6:
+ bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV6);
+ break;
+ case 10:
+ bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV4);
+ bgpManager.addVrf(rd, importRTList, ertList, AddressFamily.IPV6);
+ break;
+ default:
+ break;
}
}
- } catch (Exception e) {
- LOG.error("VpnOpStatusListener.update: Exception when updating VRF to BGP"
- + " for vpn {} rd {}", vpnName, rd);
+ } catch (RuntimeException e) {
+ LOG.error("VpnOpStatusListener.update: Exception when updating VRF to BGP for vpn {} rd {}",
+ vpnName, rd, e);
}
});
- return Collections.emptyList();
+ return emptyList();
});
}
}
@Override
- protected void add(final InstanceIdentifier<VpnInstanceOpDataEntry> identifier,
+ public void add(final InstanceIdentifier<VpnInstanceOpDataEntry> identifier,
final VpnInstanceOpDataEntry value) {
LOG.debug("add: Ignoring vpn Op {} with rd {}", value.getVpnInstanceName(), value.getVrfId());
}
Code Review / netvirt.git / blobdiff