import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
import org.opendaylight.netconf.client.NetconfClientSessionListener;
import org.opendaylight.netconf.client.conf.NetconfClientConfiguration;
.build();
}
- final Optional<NetconfSessionPreferences> userCapabilities = getUserCapabilities(node);
- final int rpcMessageLimit =
- node.getConcurrentRpcLimit() == null
- ? NetconfTopologyUtils.DEFAULT_CONCURRENT_RPC_LIMIT : node.getConcurrentRpcLimit().toJava();
+ final int rpcMessageLimit = node.getConcurrentRpcLimit() == null
+ ? NetconfTopologyUtils.DEFAULT_CONCURRENT_RPC_LIMIT : node.getConcurrentRpcLimit().toJava();
if (rpcMessageLimit < 1) {
LOG.info("{}: Concurrent rpc limit is smaller than 1, no limit will be enforced.", remoteDeviceId);
}
- NetconfDeviceCommunicator netconfDeviceCommunicator = userCapabilities.isPresent()
- ? new NetconfDeviceCommunicator(remoteDeviceId, device, new UserPreferences(userCapabilities.get(),
+ final var userCapabilities = extractUserCapabilities(node);
+ final var netconfDeviceCommunicator = userCapabilities != null
+ ? new NetconfDeviceCommunicator(remoteDeviceId, device, new UserPreferences(userCapabilities,
node.getYangModuleCapabilities() == null ? false : node.getYangModuleCapabilities().getOverride(),
node.getNonModuleCapabilities() == null ? false : node.getNonModuleCapabilities().getOverride()),
rpcMessageLimit)
return new NetconfConnectorDTO(netconfDeviceCommunicator, salFacade, registeredYangLibSources);
}
- private static Optional<NetconfSessionPreferences> getUserCapabilities(final NetconfNode node) {
- if (node.getYangModuleCapabilities() == null && node.getNonModuleCapabilities() == null) {
- return Optional.empty();
+ // FIXME: reconcile with AbstractNetconfTopology
+ private static @Nullable NetconfSessionPreferences extractUserCapabilities(final NetconfNode node) {
+ final var moduleCaps = node.getYangModuleCapabilities();
+ final var nonModuleCaps = node.getNonModuleCapabilities();
+
+ if (moduleCaps == null && node.getNonModuleCapabilities() == null) {
+ return null;
}
- final List<String> capabilities = new ArrayList<>();
- if (node.getYangModuleCapabilities() != null) {
- capabilities.addAll(node.getYangModuleCapabilities().getCapability());
+ final var capabilities = new ArrayList<String>();
+ if (moduleCaps != null) {
+ capabilities.addAll(moduleCaps.getCapability());
}
//non-module capabilities should not exist in yang module capabilities
- final NetconfSessionPreferences netconfSessionPreferences = NetconfSessionPreferences.fromStrings(capabilities);
+ final var netconfSessionPreferences = NetconfSessionPreferences.fromStrings(capabilities);
checkState(netconfSessionPreferences.getNonModuleCaps().isEmpty(),
"List yang-module-capabilities/capability should contain only module based capabilities. "
+ "Non-module capabilities used: " + netconfSessionPreferences.getNonModuleCaps());
- if (node.getNonModuleCapabilities() != null) {
- capabilities.addAll(node.getNonModuleCapabilities().getCapability());
+ if (nonModuleCaps != null) {
+ capabilities.addAll(nonModuleCaps.getCapability());
}
- return Optional.of(NetconfSessionPreferences.fromStrings(capabilities, CapabilityOrigin.UserDefined));
+ return NetconfSessionPreferences.fromStrings(capabilities, CapabilityOrigin.UserDefined);
}
@VisibleForTesting
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.concurrent.ExecutionException;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
import org.opendaylight.controller.config.threadpool.ThreadPool;
yanglibRegistrations = registerDeviceSchemaSources(deviceId, node, resources);
}
- final Optional<UserPreferences> userCapabilities = getUserCapabilities(node);
final int rpcMessageLimit = node.requireConcurrentRpcLimit().toJava();
if (rpcMessageLimit < 1) {
LOG.info("Concurrent rpc limit is smaller than 1, no limit will be enforced for device {}", deviceId);
}
- final NetconfDeviceCommunicator netconfDeviceCommunicator =
- userCapabilities.isPresent() ? new NetconfDeviceCommunicator(deviceId, device,
- userCapabilities.get(), rpcMessageLimit)
- : new NetconfDeviceCommunicator(deviceId, device, rpcMessageLimit);
+ final var netconfDeviceCommunicator = new NetconfDeviceCommunicator(deviceId, device, rpcMessageLimit,
+ extractUserCapabilities(node));
if (keepAliveFacade != null) {
keepAliveFacade.setListener(netconfDeviceCommunicator);
throw new IllegalStateException("Unsupported credential type: " + credentials.getClass());
}
- private static Optional<UserPreferences> getUserCapabilities(final NetconfNode node) {
- // if none of yang-module-capabilities or non-module-capabilities is specified
- // just return absent
- if (node.getYangModuleCapabilities() == null && node.getNonModuleCapabilities() == null) {
- return Optional.empty();
- }
+ private static @Nullable UserPreferences extractUserCapabilities(final NetconfNode node) {
+ final var moduleCaps = node.getYangModuleCapabilities();
+ final var nonModuleCaps = node.getNonModuleCapabilities();
- final List<String> capabilities = new ArrayList<>();
+ if (moduleCaps == null && nonModuleCaps == null) {
+ // if none of yang-module-capabilities or non-module-capabilities is specified
+ return null;
+ }
- boolean overrideYangModuleCaps = false;
- if (node.getYangModuleCapabilities() != null) {
- capabilities.addAll(node.getYangModuleCapabilities().getCapability());
- overrideYangModuleCaps = node.getYangModuleCapabilities().getOverride();
+ final var capabilities = new ArrayList<String>();
+ final boolean overrideYangModuleCaps;
+ if (moduleCaps != null) {
+ capabilities.addAll(moduleCaps.getCapability());
+ overrideYangModuleCaps = moduleCaps.getOverride();
+ } else {
+ overrideYangModuleCaps = false;
}
//non-module capabilities should not exist in yang module capabilities
- final NetconfSessionPreferences netconfSessionPreferences = NetconfSessionPreferences.fromStrings(capabilities);
+ final var netconfSessionPreferences = NetconfSessionPreferences.fromStrings(capabilities);
Preconditions.checkState(netconfSessionPreferences.getNonModuleCaps().isEmpty(),
"List yang-module-capabilities/capability should contain only module based capabilities. "
+ "Non-module capabilities used: " + netconfSessionPreferences.getNonModuleCaps());
- boolean overrideNonModuleCaps = false;
- if (node.getNonModuleCapabilities() != null) {
- capabilities.addAll(node.getNonModuleCapabilities().getCapability());
- overrideNonModuleCaps = node.getNonModuleCapabilities().getOverride();
+ final boolean overrideNonModuleCaps;
+ if (nonModuleCaps != null) {
+ capabilities.addAll(nonModuleCaps.getCapability());
+ overrideNonModuleCaps = nonModuleCaps.getOverride();
+ } else {
+ overrideNonModuleCaps = false;
}
- return Optional.of(new UserPreferences(NetconfSessionPreferences
- .fromStrings(capabilities, CapabilityOrigin.UserDefined), overrideYangModuleCaps, overrideNonModuleCaps));
+ return new UserPreferences(NetconfSessionPreferences.fromStrings(capabilities, CapabilityOrigin.UserDefined),
+ overrideYangModuleCaps, overrideNonModuleCaps);
}
}
*/
package org.opendaylight.netconf.sal.connect.netconf.listener;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.base.Strings;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Optional;
import java.util.Queue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.netconf.api.FailedNetconfMessage;
import org.opendaylight.netconf.api.NetconfDocumentedException;
import org.opendaylight.netconf.api.NetconfMessage;
private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceCommunicator.class);
protected final RemoteDevice<NetconfDeviceCommunicator> remoteDevice;
- private final Optional<UserPreferences> overrideNetconfCapabilities;
+ private final @Nullable UserPreferences overrideNetconfCapabilities;
protected final RemoteDeviceId id;
private final Lock sessionLock = new ReentrantLock();
public NetconfDeviceCommunicator(final RemoteDeviceId id,
final RemoteDevice<NetconfDeviceCommunicator> remoteDevice,
final UserPreferences netconfSessionPreferences, final int rpcMessageLimit) {
- this(id, remoteDevice, Optional.of(netconfSessionPreferences), rpcMessageLimit);
+ this(id, remoteDevice, rpcMessageLimit, requireNonNull(netconfSessionPreferences));
}
public NetconfDeviceCommunicator(final RemoteDeviceId id,
final RemoteDevice<NetconfDeviceCommunicator> remoteDevice, final int rpcMessageLimit) {
- this(id, remoteDevice, Optional.empty(), rpcMessageLimit);
+ this(id, remoteDevice, rpcMessageLimit, null);
}
- private NetconfDeviceCommunicator(final RemoteDeviceId id,
- final RemoteDevice<NetconfDeviceCommunicator> remoteDevice,
- final Optional<UserPreferences> overrideNetconfCapabilities, final int rpcMessageLimit) {
+ public NetconfDeviceCommunicator(final RemoteDeviceId id,
+ final RemoteDevice<NetconfDeviceCommunicator> remoteDevice, final int rpcMessageLimit,
+ final @Nullable UserPreferences overrideNetconfCapabilities) {
concurentRpcMsgs = rpcMessageLimit;
this.id = id;
this.remoteDevice = remoteDevice;
LOG.trace("{}: Session advertised capabilities: {}", id,
netconfSessionPreferences);
- if (overrideNetconfCapabilities.isPresent()) {
- final NetconfSessionPreferences sessionPreferences = overrideNetconfCapabilities
- .get().getSessionPreferences();
- netconfSessionPreferences = overrideNetconfCapabilities.get().moduleBasedCapsOverrided()
+ final var localOverride = overrideNetconfCapabilities;
+ if (localOverride != null) {
+ final var sessionPreferences = localOverride.getSessionPreferences();
+ netconfSessionPreferences = localOverride.moduleBasedCapsOverrided()
? netconfSessionPreferences.replaceModuleCaps(sessionPreferences)
: netconfSessionPreferences.addModuleCaps(sessionPreferences);
- netconfSessionPreferences = overrideNetconfCapabilities.get().nonModuleBasedCapsOverrided()
+ netconfSessionPreferences = localOverride.nonModuleBasedCapsOverrided()
? netconfSessionPreferences.replaceNonModuleCaps(sessionPreferences)
: netconfSessionPreferences.addNonModuleCaps(sessionPreferences);
LOG.debug("{}: Session capabilities overridden, capabilities that will be used: {}", id,