* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netconf.topology.singleton.impl;
import akka.actor.ActorRef;
import akka.dispatch.OnComplete;
import akka.pattern.Patterns;
import akka.util.Timeout;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import java.util.List;
import java.util.stream.Collectors;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotification;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
+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.sal.connect.api.RemoteDeviceHandler;
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.NetconfDeviceSalProvider;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.netconf.topology.singleton.messages.CreateInitialMasterActorData;
-import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.concurrent.Future;
private final ActorRef masterActorRef;
private final ActorSystem actorSystem;
- private SchemaContext remoteSchemaContext = null;
+ private SchemaContext currentSchemaContext = null;
private NetconfSessionPreferences netconfSessionPreferences = null;
private DOMRpcService deviceRpc = null;
private DOMDataBroker deviceDataBroker = null;
@Override
public void onDeviceConnected(final SchemaContext remoteSchemaContext,
- final NetconfSessionPreferences netconfSessionPreferences,
- final DOMRpcService deviceRpc) {
- this.remoteSchemaContext = remoteSchemaContext;
- this.netconfSessionPreferences = netconfSessionPreferences;
- this.deviceRpc = deviceRpc;
+ final NetconfSessionPreferences sessionPreferences,
+ final DOMRpcService domRpcService, final DOMActionService domActionService) {
+ // We do not support actions in clustered topology yet
+ if (domActionService != null) {
+ LOG.warn("{}: YANG 1.1 actions are not supported in clustered netconf topology, "
+ + "DOMActionService will not be exposed for the device", id);
+ }
+
+ onDeviceConnected(remoteSchemaContext, sessionPreferences, domRpcService);
+ }
+
+ @Override
+ public void onDeviceConnected(final SchemaContext remoteSchemaContext,
+ final NetconfSessionPreferences sessionPreferences,
+ final DOMRpcService domRpcService) {
+ this.currentSchemaContext = remoteSchemaContext;
+ this.netconfSessionPreferences = sessionPreferences;
+ this.deviceRpc = domRpcService;
+
+ LOG.info("Device {} connected - registering master mount point", id);
registerMasterMountPoint();
sendInitialDataToActor().onComplete(new OnComplete<Object>() {
@Override
- public void onComplete(final Throwable failure, final Object success) throws Throwable {
+ public void onComplete(final Throwable failure, final Object success) {
if (failure == null) {
updateDeviceData();
return;
}
- throw failure;
+
+ 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());
unregisterMasterMountPoint();
}
private void registerMasterMountPoint() {
Preconditions.checkNotNull(id);
- Preconditions.checkNotNull(remoteSchemaContext,
+ Preconditions.checkNotNull(currentSchemaContext,
"Device has no remote schema context yet. Probably not fully connected.");
Preconditions.checkNotNull(netconfSessionPreferences,
"Device has no capabilities yet. Probably not fully connected.");
final NetconfDeviceNotificationService notificationService = new NetconfDeviceNotificationService();
- LOG.info("{}: Creating master data broker for device", id);
+ deviceDataBroker = newDeviceDataBroker();
- deviceDataBroker = new NetconfDeviceDataBroker(id, remoteSchemaContext, deviceRpc, netconfSessionPreferences);
// We need to create ProxyDOMDataBroker so accessing mountpoint
// on leader node would be same as on follower node
final ProxyDOMDataBroker proxyDataBroker =
- new ProxyDOMDataBroker(actorSystem, id, masterActorRef, actorResponseWaitTime);
+ new ProxyDOMDataBroker(id, masterActorRef, actorSystem.dispatcher(), actorResponseWaitTime);
salProvider.getMountInstance()
- .onTopologyDeviceConnected(remoteSchemaContext, proxyDataBroker, deviceRpc, notificationService);
+ .onTopologyDeviceConnected(currentSchemaContext, proxyDataBroker, deviceRpc, notificationService);
+ }
+
+ protected DOMDataBroker newDeviceDataBroker() {
+ return new NetconfDeviceDataBroker(id, currentSchemaContext, deviceRpc, netconfSessionPreferences);
}
private Future<Object> sendInitialDataToActor() {
final List<SourceIdentifier> sourceIdentifiers =
- remoteSchemaContext.getAllModuleIdentifiers().stream().map(mi ->
- RevisionSourceIdentifier.create(mi.getName(),
- (SimpleDateFormatUtil.DEFAULT_DATE_REV == mi.getRevision() ? Optional.<String>absent() :
- Optional.of(mi.getQNameModule().getFormattedRevision()))))
- .collect(Collectors.toList());
+ SchemaContextUtil.getConstituentModuleIdentifiers(currentSchemaContext).stream()
+ .map(mi -> RevisionSourceIdentifier.create(mi.getName(), mi.getRevision()))
+ .collect(Collectors.toList());
+
+ LOG.debug("{}: Sending CreateInitialMasterActorData with sourceIdentifiers {} to {}",
+ id, sourceIdentifiers, masterActorRef);
- // send initial data to master actor and create actor for providing it
+ // send initial data to master actor
return Patterns.ask(masterActorRef, new CreateInitialMasterActorData(deviceDataBroker, sourceIdentifiers,
deviceRpc), actorResponseWaitTime);
}
private void updateDeviceData() {
- final Cluster cluster = Cluster.get(actorSystem);
- salProvider.getTopologyDatastoreAdapter().updateClusteredDeviceData(true, cluster.selfAddress().toString(),
+ final String masterAddress = Cluster.get(actorSystem).selfAddress().toString();
+ LOG.debug("{}: updateDeviceData with master address {}", id, masterAddress);
+ salProvider.getTopologyDatastoreAdapter().updateClusteredDeviceData(true, masterAddress,
netconfSessionPreferences.getNetconfDeviceCapabilities());
}
Code Review / netconf.git / blobdiff