import akka.util.Timeout;
import java.util.List;
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.DOMMountPointService;
import org.opendaylight.mdsal.dom.api.DOMNotification;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices;
+import org.opendaylight.netconf.sal.connect.netconf.NetconfDeviceSchema;
import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCapabilities;
import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
import org.opendaylight.netconf.sal.connect.netconf.sal.AbstractNetconfDataTreeService;
import org.opendaylight.netconf.sal.connect.netconf.sal.NetconfDeviceDataBroker;
-import org.opendaylight.netconf.sal.connect.netconf.sal.NetconfDeviceNotificationService;
import org.opendaylight.netconf.sal.connect.netconf.sal.NetconfDeviceSalProvider;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.netconf.topology.singleton.messages.CreateInitialMasterActorData;
private final ActorRef masterActorRef;
private final ActorSystem actorSystem;
- private MountPointContext currentMountContext = null;
+ private NetconfDeviceSchema currentSchema = null;
private NetconfSessionPreferences netconfSessionPreferences = null;
- private DOMRpcService deviceRpc = null;
+ private RemoteDeviceServices deviceServices = null;
private DOMDataBroker deviceDataBroker = null;
private NetconfDataTreeService netconfService = null;
- private DOMActionService deviceAction = null;
MasterSalFacade(final RemoteDeviceId id,
final ActorSystem actorSystem,
}
@Override
- public void onDeviceConnected(final MountPointContext mountContext,
- final NetconfSessionPreferences sessionPreferences,
- final DOMRpcService domRpcService, final DOMActionService domActionService) {
- deviceAction = domActionService;
- LOG.debug("{}: YANG 1.1 actions are supported in clustered netconf topology, "
- + "DOMActionService exposed for the device", id);
- onDeviceConnected(mountContext, sessionPreferences, domRpcService);
- }
-
- @Override
- public void onDeviceConnected(final MountPointContext mountContext,
- final NetconfSessionPreferences sessionPreferences,
- final DOMRpcService domRpcService) {
- currentMountContext = mountContext;
- netconfSessionPreferences = sessionPreferences;
- deviceRpc = domRpcService;
+ public void onDeviceConnected(final NetconfDeviceSchema deviceSchema,
+ final NetconfSessionPreferences sessionPreferences, final RemoteDeviceServices services) {
+ currentSchema = requireNonNull(deviceSchema);
+ netconfSessionPreferences = requireNonNull(sessionPreferences);
+ deviceServices = requireNonNull(services);
+ if (services.actions() != null) {
+ LOG.debug("{}: YANG 1.1 actions are supported in clustered netconf topology, DOMActionService exposed for "
+ + "the device", id);
+ }
LOG.info("Device {} connected - registering master mount point", id);
LOG.error("{}: CreateInitialMasterActorData to {} failed", id, masterActorRef, failure);
}
}, actorSystem.dispatcher());
-
}
@Override
public void onDeviceDisconnected() {
LOG.info("Device {} disconnected - unregistering master mount point", id);
- salProvider.getTopologyDatastoreAdapter().updateDeviceData(false, new NetconfDeviceCapabilities());
+ salProvider.getTopologyDatastoreAdapter().updateDeviceData(false, NetconfDeviceCapabilities.empty());
unregisterMasterMountPoint();
}
private void registerMasterMountPoint() {
requireNonNull(id);
- requireNonNull(currentMountContext, "Device has no remote schema context yet. Probably not fully connected.");
- requireNonNull(netconfSessionPreferences, "Device has no capabilities yet. Probably not fully connected.");
- final NetconfDeviceNotificationService notificationService = new NetconfDeviceNotificationService();
- deviceDataBroker = newDeviceDataBroker();
- netconfService = newNetconfDataTreeService();
+ final var mountContext = requireNonNull(currentSchema,
+ "Device has no remote schema context yet. Probably not fully connected.")
+ .mountContext();
+ final var preferences = requireNonNull(netconfSessionPreferences,
+ "Device has no capabilities yet. Probably not fully connected.");
+
+ deviceDataBroker = newDeviceDataBroker(mountContext, preferences);
+ netconfService = newNetconfDataTreeService(mountContext, preferences);
// We need to create ProxyDOMDataBroker so accessing mountpoint
// on leader node would be same as on follower node
actorResponseWaitTime);
final NetconfDataTreeService proxyNetconfService = new ProxyNetconfDataTreeService(id, masterActorRef,
actorSystem.dispatcher(), actorResponseWaitTime);
- salProvider.getMountInstance().onTopologyDeviceConnected(currentMountContext.getEffectiveModelContext(),
- proxyDataBroker, proxyNetconfService, deviceRpc, notificationService, deviceAction);
+ salProvider.getMountInstance().onTopologyDeviceConnected(mountContext.getEffectiveModelContext(),
+ deviceServices, proxyDataBroker, proxyNetconfService);
}
- protected DOMDataBroker newDeviceDataBroker() {
- return new NetconfDeviceDataBroker(id, currentMountContext, deviceRpc, netconfSessionPreferences);
+ protected DOMDataBroker newDeviceDataBroker(final MountPointContext mountContext,
+ final NetconfSessionPreferences preferences) {
+ return new NetconfDeviceDataBroker(id, mountContext, deviceServices.rpcs(), preferences);
}
- protected NetconfDataTreeService newNetconfDataTreeService() {
- return AbstractNetconfDataTreeService.of(id, currentMountContext, deviceRpc, netconfSessionPreferences);
+ protected NetconfDataTreeService newNetconfDataTreeService(final MountPointContext mountContext,
+ final NetconfSessionPreferences preferences) {
+ return AbstractNetconfDataTreeService.of(id, mountContext, deviceServices.rpcs(), preferences);
}
private Future<Object> sendInitialDataToActor() {
final List<SourceIdentifier> sourceIdentifiers = List.copyOf(SchemaContextUtil.getConstituentModuleIdentifiers(
- currentMountContext.getEffectiveModelContext()));
+ currentSchema.mountContext().getEffectiveModelContext()));
LOG.debug("{}: Sending CreateInitialMasterActorData with sourceIdentifiers {} to {}", id, sourceIdentifiers,
masterActorRef);
// send initial data to master actor
return Patterns.ask(masterActorRef, new CreateInitialMasterActorData(deviceDataBroker, netconfService,
- sourceIdentifiers, deviceRpc, deviceAction), actorResponseWaitTime);
+ sourceIdentifiers, deviceServices.rpcs(), deviceServices.actions()), actorResponseWaitTime);
}
private void updateDeviceData() {
final String masterAddress = Cluster.get(actorSystem).selfAddress().toString();
LOG.debug("{}: updateDeviceData with master address {}", id, masterAddress);
salProvider.getTopologyDatastoreAdapter().updateClusteredDeviceData(true, masterAddress,
- netconfSessionPreferences.getNetconfDeviceCapabilities());
+ currentSchema.capabilities());
}
private void unregisterMasterMountPoint() {
Code Review / netconf.git / blobdiff