*/
package org.opendaylight.genius.interfacemanager.commons;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.JdkFutureAdapters;
+import static org.opendaylight.mdsal.binding.util.Datastore.OPERATIONAL;
+
+import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
-import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
-import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
+import org.apache.aries.blueprint.annotation.service.Reference;
+import org.opendaylight.infrautils.utils.concurrent.LoggingFutures;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.util.Datastore.Operational;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.mdsal.binding.util.TypedReadTransaction;
+import org.opendaylight.mdsal.binding.util.TypedReadWriteTransaction;
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.alivenessmonitor.rev160411.AlivenessMonitorService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.EtherTypes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileCreateInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileCreateInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileCreateOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileDeleteInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileDeleteInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileDeleteOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileGetInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileGetInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProfileGetOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProtocolType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStartInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStartInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStartOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStopInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStopInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorStopOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitoringMode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.params.SourceBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.profile.create.input.Profile;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelMonitoringTypeLldp;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class AlivenessMonitorUtils {
private static final Logger LOG = LoggerFactory.getLogger(AlivenessMonitorUtils.class);
- private static final long FAILURE_THRESHOLD = 4;
- private static final long MONITORING_WINDOW = 4;
+ private static final Uint32 FAILURE_THRESHOLD = Uint32.valueOf(4).intern();
+ private static final Uint32 MONITORING_WINDOW = Uint32.valueOf(4).intern();
private final AlivenessMonitorService alivenessMonitorService;
private final ManagedNewTransactionRunner txRunner;
@Inject
- public AlivenessMonitorUtils(AlivenessMonitorService alivenessMonitor, DataBroker dataBroker) {
+ public AlivenessMonitorUtils(AlivenessMonitorService alivenessMonitor, @Reference DataBroker dataBroker) {
this.alivenessMonitorService = alivenessMonitor;
this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
}
getInterfaceForMonitoring(trunkInterfaceName, ifTunnel.getTunnelSource()))
.build())
.setMode(MonitoringMode.OneOne)
- .setProfileId(allocateProfile(FAILURE_THRESHOLD,
- ifTunnel.getMonitorInterval(), MONITORING_WINDOW, EtherTypes.Lldp))
+ .setProfileId(allocateProfile(FAILURE_THRESHOLD, ifTunnel.getMonitorInterval(),
+ MONITORING_WINDOW, MonitorProtocolType.Lldp))
.build())
.build();
try {
Future<RpcResult<MonitorStartOutput>> result = alivenessMonitorService.monitorStart(lldpMonitorInput);
RpcResult<MonitorStartOutput> rpcResult = result.get();
if (rpcResult.isSuccessful()) {
- long monitorId = rpcResult.getResult().getMonitorId();
- ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
- createOrUpdateInterfaceMonitorIdMap(tx, trunkInterfaceName, monitorId);
- createOrUpdateMonitorIdInterfaceMap(tx, trunkInterfaceName, monitorId);
- LOG.trace("Started LLDP monitoring with id {}", monitorId);
- }), LOG, "Error starting monitoring");
+ Uint32 monitorId = rpcResult.getResult().getMonitorId();
+ LoggingFutures.addErrorLogging(
+ txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
+ createOrUpdateInterfaceMonitorIdMap(tx, trunkInterfaceName, monitorId);
+ createOrUpdateMonitorIdInterfaceMap(tx, trunkInterfaceName, monitorId);
+ LOG.trace("Started LLDP monitoring with id {}", monitorId);
+ }), LOG, "Error starting monitoring");
} else {
LOG.warn("RPC Call to start monitoring returned with Errors {}", rpcResult.getErrors());
}
return;
}
LOG.debug("stop LLDP monitoring for {}", trunkInterface);
- ListenableFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> {
- List<Long> monitorIds = getMonitorIdForInterface(tx, trunkInterface);
+ LoggingFutures.addErrorLogging(txRunner.callWithNewReadWriteTransactionAndSubmit(OPERATIONAL, tx -> {
+ List<Uint32> monitorIds = getMonitorIdForInterface(tx, trunkInterface);
if (monitorIds == null) {
LOG.error("Monitor Id doesn't exist for Interface {}", trunkInterface);
return;
}
- for (Long monitorId : monitorIds) {
+ for (Uint32 monitorId : monitorIds) {
String interfaceName = getInterfaceFromMonitorId(tx, monitorId);
if (interfaceName != null) {
MonitorStopInput input = new MonitorStopInputBuilder().setMonitorId(monitorId).build();
- Future<RpcResult<Void>> future = alivenessMonitorService.monitorStop(input);
- ListenableFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread(future),
- LOG, "Stop LLDP monitoring for {}", trunkInterface);
+ ListenableFuture<RpcResult<MonitorStopOutput>> future = alivenessMonitorService.monitorStop(input);
+ LoggingFutures.addErrorLogging(future, LOG, "Stop LLDP monitoring for {}", trunkInterface);
removeMonitorIdInterfaceMap(tx, monitorId);
removeMonitorIdFromInterfaceMonitorIdMap(tx, interfaceName, monitorId);
}), LOG, "Error stopping LLDP monitoring for {}", trunkInterface);
}
- public static String getInterfaceFromMonitorId(ReadTransaction tx, Long monitorId) throws ReadFailedException {
+ public static String getInterfaceFromMonitorId(TypedReadTransaction<Operational> tx, Uint32 monitorId)
+ throws ExecutionException, InterruptedException {
InstanceIdentifier<MonitorIdInterface> id = InstanceIdentifier.builder(MonitorIdInterfaceMap.class)
.child(MonitorIdInterface.class, new MonitorIdInterfaceKey(monitorId)).build();
- return tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet()
- .toJavaUtil().map(MonitorIdInterface::getInterfaceName).orElse(null);
+ return tx.read(id).get().map(MonitorIdInterface::getInterfaceName).orElse(null);
}
- private void removeMonitorIdInterfaceMap(ReadWriteTransaction tx, long monitorId) throws ReadFailedException {
+ private void removeMonitorIdInterfaceMap(TypedReadWriteTransaction<Operational> tx, Uint32 monitorId)
+ throws ExecutionException, InterruptedException {
InstanceIdentifier<MonitorIdInterface> id = InstanceIdentifier.builder(MonitorIdInterfaceMap.class)
.child(MonitorIdInterface.class, new MonitorIdInterfaceKey(monitorId)).build();
- if (tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet().isPresent()) {
- tx.delete(LogicalDatastoreType.OPERATIONAL, id);
+ if (tx.read(id).get().isPresent()) {
+ tx.delete(id);
}
}
- private void removeMonitorIdFromInterfaceMonitorIdMap(ReadWriteTransaction tx, String infName, long monitorId)
- throws ReadFailedException {
+ private void removeMonitorIdFromInterfaceMonitorIdMap(TypedReadWriteTransaction<Operational> tx, String infName,
+ Uint32 monitorId) throws ExecutionException, InterruptedException {
InstanceIdentifier<InterfaceMonitorId> id = InstanceIdentifier.builder(InterfaceMonitorIdMap.class)
.child(InterfaceMonitorId.class, new InterfaceMonitorIdKey(infName)).build();
- Optional<InterfaceMonitorId> interfaceMonitorIdMap = tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet();
+ Optional<InterfaceMonitorId> interfaceMonitorIdMap = tx.read(id).get();
if (interfaceMonitorIdMap.isPresent()) {
InterfaceMonitorId interfaceMonitorIdInstance = interfaceMonitorIdMap.get();
- List<Long> existingMonitorIds = interfaceMonitorIdInstance.getMonitorId();
+ List<Uint32> existingMonitorIds = interfaceMonitorIdInstance.getMonitorId();
if (existingMonitorIds != null && existingMonitorIds.contains(monitorId)) {
existingMonitorIds.remove(monitorId);
InterfaceMonitorIdBuilder interfaceMonitorIdBuilder = new InterfaceMonitorIdBuilder();
- interfaceMonitorIdInstance = interfaceMonitorIdBuilder.setKey(new InterfaceMonitorIdKey(infName))
+ interfaceMonitorIdInstance = interfaceMonitorIdBuilder.withKey(new InterfaceMonitorIdKey(infName))
.setMonitorId(existingMonitorIds).build();
- tx.merge(LogicalDatastoreType.OPERATIONAL, id, interfaceMonitorIdInstance,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ tx.mergeParentStructureMerge(id, interfaceMonitorIdInstance);
}
}
}
public void handleTunnelMonitorUpdates(Interface interfaceOld, Interface interfaceNew) {
String interfaceName = interfaceNew.getName();
- IfTunnel ifTunnelNew = interfaceNew.getAugmentation(IfTunnel.class);
+ IfTunnel ifTunnelNew = interfaceNew.augmentation(IfTunnel.class);
if (!lldpMonitoringEnabled(ifTunnelNew)) {
return;
}
startLLDPMonitoring(ifTunnelNew, interfaceName);
// Delete old profile from Aliveness Manager
- IfTunnel ifTunnelOld = interfaceOld.getAugmentation(IfTunnel.class);
- if (!ifTunnelNew.getMonitorInterval().equals(ifTunnelOld.getMonitorInterval())) {
+ IfTunnel ifTunnelOld = interfaceOld.augmentation(IfTunnel.class);
+ if (!Objects.equals(ifTunnelNew.getMonitorInterval(), ifTunnelOld.getMonitorInterval())) {
LOG.debug("deleting older monitor profile for interface {}", interfaceName);
- long profileId = allocateProfile(FAILURE_THRESHOLD, ifTunnelOld.getMonitorInterval(), MONITORING_WINDOW,
- EtherTypes.Lldp);
+ Uint32 profileId = allocateProfile(FAILURE_THRESHOLD, ifTunnelOld.getMonitorInterval(),
+ MONITORING_WINDOW, MonitorProtocolType.Lldp);
MonitorProfileDeleteInput profileDeleteInput = new MonitorProfileDeleteInputBuilder()
.setProfileId(profileId).build();
- Future<RpcResult<Void>> future = alivenessMonitorService.monitorProfileDelete(profileDeleteInput);
- ListenableFutures.addErrorLogging(JdkFutureAdapters.listenInPoolThread(future),
- LOG, "Delete monitor profile {}", interfaceName);
+ ListenableFuture<RpcResult<MonitorProfileDeleteOutput>> future =
+ alivenessMonitorService.monitorProfileDelete(profileDeleteInput);
+ LoggingFutures.addErrorLogging(future, LOG, "Delete monitor profile {}", interfaceName);
}
}
}
- private static void createOrUpdateInterfaceMonitorIdMap(ReadWriteTransaction tx, String infName, long monitorId)
- throws ReadFailedException {
+ private static void createOrUpdateInterfaceMonitorIdMap(TypedReadWriteTransaction<Operational> tx, String infName,
+ Uint32 monitorId) throws ExecutionException, InterruptedException {
InterfaceMonitorId interfaceMonitorIdInstance;
- List<Long> existingMonitorIds;
+ List<Uint32> existingMonitorIds;
InterfaceMonitorIdBuilder interfaceMonitorIdBuilder = new InterfaceMonitorIdBuilder();
InstanceIdentifier<InterfaceMonitorId> id = InstanceIdentifier.builder(InterfaceMonitorIdMap.class)
.child(InterfaceMonitorId.class, new InterfaceMonitorIdKey(infName)).build();
- Optional<InterfaceMonitorId> interfaceMonitorIdMap =
- tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet();
+ Optional<InterfaceMonitorId> interfaceMonitorIdMap = tx.read(id).get();
if (interfaceMonitorIdMap.isPresent()) {
interfaceMonitorIdInstance = interfaceMonitorIdMap.get();
existingMonitorIds = interfaceMonitorIdInstance.getMonitorId();
}
if (!existingMonitorIds.contains(monitorId)) {
existingMonitorIds.add(monitorId);
- interfaceMonitorIdInstance = interfaceMonitorIdBuilder.setKey(new InterfaceMonitorIdKey(infName))
+ interfaceMonitorIdInstance = interfaceMonitorIdBuilder.withKey(new InterfaceMonitorIdKey(infName))
.setMonitorId(existingMonitorIds).build();
- tx.merge(LogicalDatastoreType.OPERATIONAL, id, interfaceMonitorIdInstance,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ tx.mergeParentStructureMerge(id, interfaceMonitorIdInstance);
}
} else {
existingMonitorIds = new ArrayList<>();
existingMonitorIds.add(monitorId);
interfaceMonitorIdInstance = interfaceMonitorIdBuilder.setMonitorId(existingMonitorIds)
- .setKey(new InterfaceMonitorIdKey(infName)).setInterfaceName(infName).build();
- tx.merge(LogicalDatastoreType.OPERATIONAL, id, interfaceMonitorIdInstance,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ .withKey(new InterfaceMonitorIdKey(infName)).setInterfaceName(infName).build();
+ tx.mergeParentStructureMerge(id, interfaceMonitorIdInstance);
}
}
- private static void createOrUpdateMonitorIdInterfaceMap(ReadWriteTransaction tx, String infName, long monitorId)
- throws ReadFailedException {
+ private static void createOrUpdateMonitorIdInterfaceMap(TypedReadWriteTransaction<Operational> tx, String infName,
+ Uint32 monitorId) throws ExecutionException, InterruptedException {
MonitorIdInterface monitorIdInterfaceInstance;
String existinginterfaceName;
MonitorIdInterfaceBuilder monitorIdInterfaceBuilder = new MonitorIdInterfaceBuilder();
InstanceIdentifier<MonitorIdInterface> id = InstanceIdentifier.builder(MonitorIdInterfaceMap.class)
.child(MonitorIdInterface.class, new MonitorIdInterfaceKey(monitorId)).build();
- Optional<MonitorIdInterface> monitorIdInterfaceMap =
- tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet();
+ Optional<MonitorIdInterface> monitorIdInterfaceMap = tx.read(id).get();
if (monitorIdInterfaceMap.isPresent()) {
monitorIdInterfaceInstance = monitorIdInterfaceMap.get();
existinginterfaceName = monitorIdInterfaceInstance.getInterfaceName();
- if (!existinginterfaceName.equals(infName)) {
- monitorIdInterfaceInstance = monitorIdInterfaceBuilder.setKey(new MonitorIdInterfaceKey(monitorId))
+ if (!Objects.equals(existinginterfaceName, infName)) {
+ monitorIdInterfaceInstance = monitorIdInterfaceBuilder.withKey(new MonitorIdInterfaceKey(monitorId))
.setInterfaceName(infName).build();
- tx.merge(LogicalDatastoreType.OPERATIONAL, id, monitorIdInterfaceInstance,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ tx.mergeParentStructureMerge(id, monitorIdInterfaceInstance);
}
} else {
monitorIdInterfaceInstance = monitorIdInterfaceBuilder.setMonitorId(monitorId)
- .setKey(new MonitorIdInterfaceKey(monitorId)).setInterfaceName(infName).build();
- tx.merge(LogicalDatastoreType.OPERATIONAL, id, monitorIdInterfaceInstance,
- WriteTransaction.CREATE_MISSING_PARENTS);
+ .withKey(new MonitorIdInterfaceKey(monitorId)).setInterfaceName(infName).build();
+ tx.mergeParentStructureMerge(id, monitorIdInterfaceInstance);
}
}
- private static List<Long> getMonitorIdForInterface(ReadTransaction tx, String infName) throws ReadFailedException {
+ private static List<Uint32> getMonitorIdForInterface(TypedReadTransaction<Operational> tx, String infName)
+ throws ExecutionException, InterruptedException {
InstanceIdentifier<InterfaceMonitorId> id = InstanceIdentifier.builder(InterfaceMonitorIdMap.class)
.child(InterfaceMonitorId.class, new InterfaceMonitorIdKey(infName)).build();
- return tx.read(LogicalDatastoreType.OPERATIONAL, id).checkedGet().toJavaUtil().map(
- InterfaceMonitorId::getMonitorId).orElse(null);
+ return tx.read(id).get().map(InterfaceMonitorId::getMonitorId).orElse(null);
}
- public long createMonitorProfile(MonitorProfileCreateInput monitorProfileCreateInput) {
+ public Uint32 createMonitorProfile(MonitorProfileCreateInput monitorProfileCreateInput) {
try {
Future<RpcResult<MonitorProfileCreateOutput>> result = alivenessMonitorService
.monitorProfileCreate(monitorProfileCreateInput);
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Exception when allocating profile Id", e);
}
- return 0;
+ return Uint32.valueOf(0);
}
- private static MonitorProfileGetInput buildMonitorGetProfile(long monitorInterval, long monitorWindow,
- long failureThreshold, EtherTypes protocolType) {
- org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor
- .rev160411.monitor.profile.get.input.ProfileBuilder profileBuilder =
- new org.opendaylight.yang.gen.v1.urn.opendaylight
- .genius.alivenessmonitor.rev160411.monitor.profile.get.input.ProfileBuilder();
-
- profileBuilder.setFailureThreshold(failureThreshold);
- profileBuilder.setMonitorInterval(monitorInterval);
- profileBuilder.setMonitorWindow(monitorWindow);
- profileBuilder.setProtocolType(protocolType);
- MonitorProfileGetInputBuilder buildGetProfile = new MonitorProfileGetInputBuilder();
- buildGetProfile.setProfile(profileBuilder.build());
- return buildGetProfile.build();
+ private static MonitorProfileGetInput buildMonitorGetProfile(Uint32 monitorInterval, Uint32 monitorWindow,
+ Uint32 failureThreshold, MonitorProtocolType protocolType) {
+ return new MonitorProfileGetInputBuilder()
+ .setProfile(new org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor
+ .profile.get.input.ProfileBuilder()
+ .setFailureThreshold(failureThreshold)
+ .setMonitorInterval(monitorInterval)
+ .setMonitorWindow(monitorWindow)
+ .setProtocolType(protocolType)
+ .build())
+ .build();
}
- public long allocateProfile(long failureThreshold, long monitoringInterval, long monitoringWindow,
- EtherTypes etherTypes) {
+ private Uint32 allocateProfile(Uint32 failureThreshold, Uint32 monitoringInterval, Uint32 monitoringWindow,
+ MonitorProtocolType protoType) {
MonitorProfileCreateInput input = new MonitorProfileCreateInputBuilder().setProfile(
new ProfileBuilder().setFailureThreshold(failureThreshold).setMonitorInterval(monitoringInterval)
- .setMonitorWindow(monitoringWindow).setProtocolType(etherTypes).build())
+ .setMonitorWindow(monitoringWindow).setProtocolType(protoType).build())
.build();
return createMonitorProfile(input);
}
Code Review / genius.git / blobdiff