*/
package org.opendaylight.genius.itm.confighelpers;
+import static java.util.Collections.singletonList;
+
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigInteger;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
+import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
import org.opendaylight.genius.itm.impl.ItmUtils;
import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
+import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelMonitoringTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelMonitoringTypeLldp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase;
import org.slf4j.LoggerFactory;
public class ItmInternalTunnelDeleteWorker {
+
private static final Logger LOG = LoggerFactory.getLogger(ItmInternalTunnelDeleteWorker.class) ;
+ private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
+ private final JobCoordinator jobCoordinator;
+
+ public ItmInternalTunnelDeleteWorker(DataBroker dataBroker, JobCoordinator jobCoordinator) {
+ this.dataBroker = dataBroker;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
+ this.jobCoordinator = jobCoordinator;
+ }
+
@SuppressWarnings("checkstyle:IllegalCatch")
- public static List<ListenableFuture<Void>> deleteTunnels(DataBroker dataBroker, IdManagerService idManagerService,
- IMdsalApiManager mdsalManager,
- List<DPNTEPsInfo> dpnTepsList,
- List<DPNTEPsInfo> meshedDpnList) {
+ public List<ListenableFuture<Void>> deleteTunnels(IMdsalApiManager mdsalManager, List<DPNTEPsInfo> dpnTepsList,
+ List<DPNTEPsInfo> meshedDpnList) {
LOG.trace("TEPs to be deleted {} " , dpnTepsList);
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
- try {
+ return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(writeTransaction -> {
if (dpnTepsList == null || dpnTepsList.size() == 0) {
LOG.debug("no vtep to delete");
- return futures ;
+ return;
}
if (meshedDpnList == null || meshedDpnList.size() == 0) {
LOG.debug("No Meshed Vteps");
- return futures ;
+ return;
}
for (DPNTEPsInfo srcDpn : dpnTepsList) {
- LOG.trace("Processing srcDpn " + srcDpn);
+ LOG.trace("Processing srcDpn {}", srcDpn);
List<TunnelEndPoints> meshedEndPtCache = ItmUtils.getTEPsForDpn(srcDpn.getDPNID(), meshedDpnList);
if (meshedEndPtCache == null) {
LOG.debug("No Tunnel End Point configured for this DPN {}", srcDpn.getDPNID());
- continue ;
+ continue;
}
- LOG.debug("Entries in meshEndPointCache {} for DPN Id{} ",
- meshedEndPtCache.size(), srcDpn.getDPNID());
+ LOG.debug("Entries in meshEndPointCache {} for DPN Id{} ", meshedEndPtCache.size(), srcDpn.getDPNID());
for (TunnelEndPoints srcTep : srcDpn.getTunnelEndPoints()) {
- LOG.trace("Processing srcTep " + srcTep);
+ LOG.trace("Processing srcTep {}", srcTep);
List<TzMembership> srcTZones = srcTep.getTzMembership();
boolean tepDeleteFlag = false;
// First, take care of tunnel removal, so run through all other DPNS other than srcDpn
// remove all trunk interfaces
LOG.trace("Invoking removeTrunkInterface between source TEP {} , "
+ "Destination TEP {} ", srcTep, dstTep);
- removeTrunkInterface(dataBroker, idManagerService, srcTep, dstTep, srcDpn
- .getDPNID(), dstDpn.getDPNID(), writeTransaction, futures);
+ removeTrunkInterface(srcTep, dstTep, srcDpn.getDPNID(), dstDpn.getDPNID(),
+ writeTransaction);
}
}
}
List<TzMembership> updatedList =
ItmUtils.removeTransportZoneMembership(dstTep, srcTZones);
if (updatedList.isEmpty()) {
- LOG.debug(" This TEP can be deleted " + srcTep);
+ LOG.debug(" This TEP can be deleted {}", srcTep);
tepDeleteFlag = true;
} else {
TunnelEndPointsBuilder modifiedTepBld = new TunnelEndPointsBuilder(dstTep);
InstanceIdentifier.builder(DpnEndpoints.class).child(DPNTEPsInfo.class, srcDpn.getKey())
.child(TunnelEndPoints.class, srcTep.getKey()).build();
- LOG.trace("Tep Removal of TEP {} from DPNTEPSINFO CONFIG DS with Key {} "
- + srcTep, srcTep.getKey());
+ LOG.trace("Tep Removal of TEP {} from DPNTEPSINFO CONFIG DS with Key {} ",
+ srcTep, srcTep.getKey());
writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, tepPath);
// remove the tep from the cache
meshedEndPtCache.remove(srcTep);
LOG.debug("Removing Terminating Service Table Flow ");
ItmUtils.setUpOrRemoveTerminatingServiceTable(srcDpn.getDPNID(), mdsalManager, false);
}
- LOG.trace("DPN Removal from DPNTEPSINFO CONFIG DS " + srcDpn.getDPNID());
+ LOG.trace("DPN Removal from DPNTEPSINFO CONFIG DS {}", srcDpn.getDPNID());
writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, dpnPath);
InstanceIdentifier<DpnEndpoints> tnlContainerPath =
InstanceIdentifier.builder(DpnEndpoints.class).build();
}
}
}
- futures.add(writeTransaction.submit());
- } catch (Exception e1) {
- LOG.error("exception while deleting tep", e1);
- }
- return futures ;
+ }));
}
- private static void removeTrunkInterface(DataBroker dataBroker, IdManagerService idManagerService,
- TunnelEndPoints srcTep, TunnelEndPoints dstTep, BigInteger srcDpnId,
- BigInteger dstDpnId, WriteTransaction transaction,
- List<ListenableFuture<Void>> futures) {
- String trunkfwdIfName =
- ItmUtils.getTrunkInterfaceName(idManagerService, srcTep.getInterfaceName(),
- new String(srcTep.getIpAddress().getValue()),
- new String(dstTep.getIpAddress().getValue()),
- srcTep.getTunnelType().getName());
+ private void removeTrunkInterface(TunnelEndPoints srcTep, TunnelEndPoints dstTep,
+ BigInteger srcDpnId, BigInteger dstDpnId, WriteTransaction transaction) {
+ String trunkfwdIfName = ItmUtils.getTrunkInterfaceName(srcTep.getInterfaceName(),
+ new String(srcTep.getIpAddress().getValue()),
+ new String(dstTep.getIpAddress().getValue()),
+ srcTep.getTunnelType().getName());
LOG.trace("Removing forward Trunk Interface " + trunkfwdIfName);
InstanceIdentifier<Interface> trunkIdentifier = ItmUtils.buildId(trunkfwdIfName);
LOG.debug(" Removing Trunk Interface Name - {} , Id - {} from Config DS ",
trunkfwdIfName, trunkIdentifier) ;
transaction.delete(LogicalDatastoreType.CONFIGURATION, trunkIdentifier);
- ItmUtils.itmCache.removeInterface(trunkfwdIfName);
+ ItmUtils.ITM_CACHE.removeInterface(trunkfwdIfName);
// also update itm-state ds -- Delete the forward tunnel-interface from the tunnel list
InstanceIdentifier<InternalTunnel> path = InstanceIdentifier.create(TunnelList.class)
.child(InternalTunnel.class, new InternalTunnelKey(dstDpnId, srcDpnId, srcTep.getTunnelType()));
transaction.delete(LogicalDatastoreType.CONFIGURATION,path) ;
- ItmUtils.itmCache.removeInternalTunnel(trunkfwdIfName);
+ ItmUtils.ITM_CACHE.removeInternalTunnel(trunkfwdIfName);
// Release the Ids for the forward trunk interface Name
- ItmUtils.releaseIdForTrunkInterfaceName(idManagerService,srcTep.getInterfaceName(),
+ ItmUtils.releaseIdForTrunkInterfaceName(srcTep.getInterfaceName(),
new String(srcTep.getIpAddress().getValue()),
new String(dstTep.getIpAddress().getValue()),
srcTep.getTunnelType().getName());
- removeLogicalGroupTunnel(srcDpnId, dstDpnId, dataBroker);
+ removeLogicalGroupTunnel(srcDpnId, dstDpnId);
- String trunkRevIfName = ItmUtils.getTrunkInterfaceName(idManagerService, dstTep.getInterfaceName(),
- new String(dstTep.getIpAddress().getValue()),
- new String(srcTep.getIpAddress().getValue()),
- srcTep.getTunnelType().getName());
- LOG.trace("Removing Reverse Trunk Interface " + trunkRevIfName);
+ String trunkRevIfName = ItmUtils.getTrunkInterfaceName(dstTep.getInterfaceName(),
+ new String(dstTep.getIpAddress().getValue()),
+ new String(srcTep.getIpAddress().getValue()),
+ srcTep.getTunnelType().getName());
+ LOG.trace("Removing Reverse Trunk Interface {}", trunkRevIfName);
trunkIdentifier = ItmUtils.buildId(trunkRevIfName);
LOG.debug(" Removing Trunk Interface Name - {} , Id - {} from Config DS ",
trunkRevIfName, trunkIdentifier) ;
transaction.delete(LogicalDatastoreType.CONFIGURATION, trunkIdentifier);
-
+ ItmUtils.ITM_CACHE.removeInternalTunnel(trunkRevIfName);
// also update itm-state ds -- Delete the reverse tunnel-interface from the tunnel list
path = InstanceIdentifier.create(TunnelList.class)
.child(InternalTunnel.class, new InternalTunnelKey(srcDpnId, dstDpnId, dstTep.getTunnelType()));
transaction.delete(LogicalDatastoreType.CONFIGURATION,path) ;
// Release the Ids for the reverse trunk interface Name
- ItmUtils.releaseIdForTrunkInterfaceName(idManagerService, dstTep.getInterfaceName(),
+ ItmUtils.releaseIdForTrunkInterfaceName(dstTep.getInterfaceName(),
new String(dstTep.getIpAddress().getValue()),
new String(srcTep.getIpAddress().getValue()),
dstTep.getTunnelType().getName());
- removeLogicalGroupTunnel(dstDpnId, srcDpnId, dataBroker);
-
+ removeLogicalGroupTunnel(dstDpnId, srcDpnId);
}
private static boolean checkIfTrunkExists(BigInteger srcDpnId, BigInteger dstDpnId,
return ItmUtils.read(LogicalDatastoreType.CONFIGURATION,path, dataBroker).isPresent();
}
- private static void removeLogicalGroupTunnel(BigInteger srcDpnId, BigInteger dstDpnId,
- DataBroker dataBroker) {
+ private void removeLogicalGroupTunnel(BigInteger srcDpnId, BigInteger dstDpnId) {
boolean tunnelAggregationEnabled = ItmTunnelAggregationHelper.isTunnelAggregationEnabled();
if (!tunnelAggregationEnabled) {
return;
}
String logicTunnelName = ItmUtils.getLogicalTunnelGroupName(srcDpnId, dstDpnId);
- DataStoreJobCoordinator coordinator = DataStoreJobCoordinator.getInstance();
ItmTunnelAggregationDeleteWorker addWorker =
new ItmTunnelAggregationDeleteWorker(logicTunnelName, srcDpnId, dstDpnId, dataBroker);
- coordinator.enqueueJob(logicTunnelName, addWorker);
+ jobCoordinator.enqueueJob(logicTunnelName, addWorker);
}
private static class ItmTunnelAggregationDeleteWorker implements Callable<List<ListenableFuture<Void>>> {
private final String logicTunnelName;
private final BigInteger srcDpnId;
private final BigInteger dstDpnId;
- private final DataBroker dataBroker;
+ private final ManagedNewTransactionRunner txRunner;
ItmTunnelAggregationDeleteWorker(String groupName, BigInteger srcDpnId, BigInteger dstDpnId, DataBroker db) {
this.logicTunnelName = groupName;
this.srcDpnId = srcDpnId;
this.dstDpnId = dstDpnId;
- this.dataBroker = db;
+ this.txRunner = new ManagedNewTransactionRunnerImpl(db);
}
@Override
public List<ListenableFuture<Void>> call() throws Exception {
- List<ListenableFuture<Void>> futures = new ArrayList<>();
- Collection<InternalTunnel> tunnels = ItmUtils.itmCache.getAllInternalTunnel();
+ Collection<InternalTunnel> tunnels = ItmUtils.ITM_CACHE.getAllInternalTunnel();
if (tunnels == null) {
- return futures;
+ return Collections.emptyList();
}
//The logical tunnel interface be removed only when the last tunnel interface on each OVS is deleted
boolean emptyTunnelGroup = true;
}
}
if (emptyTunnelGroup && foundLogicGroupIface) {
- WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
- LOG.debug("MULTIPLE_VxLAN_TUNNELS: remove the logical tunnel group {} because a last tunnel"
- + " interface on srcDpnId {} dstDpnId {} is removed", logicTunnelName, srcDpnId, dstDpnId);
- InstanceIdentifier<Interface> trunkIdentifier = ItmUtils.buildId(logicTunnelName);
- tx.delete(LogicalDatastoreType.CONFIGURATION, trunkIdentifier);
- ItmUtils.itmCache.removeInterface(logicTunnelName);
- InstanceIdentifier<InternalTunnel> path = InstanceIdentifier.create(TunnelList.class)
- .child(InternalTunnel.class,
- new InternalTunnelKey(dstDpnId, srcDpnId, TunnelTypeLogicalGroup.class));
- tx.delete(LogicalDatastoreType.CONFIGURATION, path);
- ItmUtils.itmCache.removeInternalTunnel(logicTunnelName);
- futures.add(tx.submit());
+ return singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
+ LOG.debug("MULTIPLE_VxLAN_TUNNELS: remove the logical tunnel group {} because a last tunnel"
+ + " interface on srcDpnId {} dstDpnId {} is removed", logicTunnelName, srcDpnId, dstDpnId);
+ InstanceIdentifier<Interface> trunkIdentifier = ItmUtils.buildId(logicTunnelName);
+ tx.delete(LogicalDatastoreType.CONFIGURATION, trunkIdentifier);
+ ItmUtils.ITM_CACHE.removeInterface(logicTunnelName);
+ InstanceIdentifier<InternalTunnel> path = InstanceIdentifier.create(TunnelList.class)
+ .child(InternalTunnel.class,
+ new InternalTunnelKey(dstDpnId, srcDpnId, TunnelTypeLogicalGroup.class));
+ tx.delete(LogicalDatastoreType.CONFIGURATION, path);
+ ItmUtils.ITM_CACHE.removeInternalTunnel(logicTunnelName);
+ }));
} else if (!emptyTunnelGroup) {
LOG.debug("MULTIPLE_VxLAN_TUNNELS: not last tunnel in logical tunnel group {}", logicTunnelName);
}
- return futures;
+ return Collections.emptyList();
}
}
}
Code Review / genius.git / blobdiff