import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
-import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.dom.api.DOMActionService;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMMountPoint;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
+import org.opendaylight.netconf.sal.connect.api.NetconfRpcService;
import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Actions;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Rpcs;
+import org.opendaylight.netconf.sal.connect.api.SchemalessRpcService;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+// FIXME: remove this class and promote MountInstance to a top-level construct
+// Non-final for mocking
public class NetconfDeviceSalProvider implements AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceSalProvider.class);
private final RemoteDeviceId id;
private final MountInstance mountInstance;
- private volatile NetconfDeviceTopologyAdapter topologyDatastoreAdapter;
-
public NetconfDeviceSalProvider(final RemoteDeviceId deviceId, final DOMMountPointService mountService) {
- this(deviceId, mountService, null);
- }
-
- // FIXME: NETCONF-918: remove this method
- public NetconfDeviceSalProvider(final RemoteDeviceId deviceId, final DOMMountPointService mountService,
- final DataBroker dataBroker) {
- id = deviceId;
+ id = requireNonNull(deviceId);
mountInstance = new MountInstance(mountService, id);
- if (dataBroker != null) {
- topologyDatastoreAdapter = new NetconfDeviceTopologyAdapter(dataBroker, id);
- }
}
public MountInstance getMountInstance() {
return mountInstance;
}
- public NetconfDeviceTopologyAdapter getTopologyDatastoreAdapter() {
- final NetconfDeviceTopologyAdapter local = topologyDatastoreAdapter;
- checkState(local != null,
- "%s: Sal provider %s was not initialized by sal. Cannot get topology datastore adapter", id, this);
- return local;
- }
-
@Override
public void close() {
mountInstance.close();
- if (topologyDatastoreAdapter != null) {
- topologyDatastoreAdapter.close();
- topologyDatastoreAdapter = null;
- }
}
public static class MountInstance implements AutoCloseable {
requireNonNull(mountService, "Closed");
checkState(topologyRegistration == null, "Already initialized");
- final DOMMountPointService.DOMMountPointBuilder mountBuilder =
- mountService.createMountPoint(id.getTopologyPath());
+ final var mountBuilder = mountService.createMountPoint(id.getTopologyPath());
mountBuilder.addService(DOMSchemaService.class, FixedDOMSchemaService.of(() -> initialCtx));
+ final var rpcs = services.rpcs();
+ mountBuilder.addService(NetconfRpcService.class, rpcs);
+ if (rpcs instanceof Rpcs.Normalized normalized) {
+ mountBuilder.addService(DOMRpcService.class, normalized);
+ } else if (rpcs instanceof Rpcs.Schemaless schemaless) {
+ mountBuilder.addService(SchemalessRpcService.class, schemaless);
+ }
+ if (services.actions() instanceof Actions.Normalized normalized) {
+ mountBuilder.addService(DOMActionService.class, normalized);
+ }
+
if (broker != null) {
mountBuilder.addService(DOMDataBroker.class, broker);
}
- mountBuilder.addService(DOMRpcService.class, services.rpcs());
- final var actions = services.actions();
- if (actions != null) {
- mountBuilder.addService(DOMActionService.class, actions);
- }
if (dataTreeService != null) {
mountBuilder.addService(NetconfDataTreeService.class, dataTreeService);
}