import akka.cluster.Cluster;
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 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.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.api.NetconfDOMTransaction;
-import org.opendaylight.netconf.topology.singleton.impl.tx.NetconfMasterDOMTransaction;
-import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologyUtils;
import org.opendaylight.netconf.topology.singleton.messages.CreateInitialMasterActorData;
import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
private static final Logger LOG = LoggerFactory.getLogger(MasterSalFacade.class);
private final RemoteDeviceId id;
+ private final Timeout actorResponseWaitTime;
private SchemaContext remoteSchemaContext = null;
private NetconfSessionPreferences netconfSessionPreferences = null;
private DOMDataBroker deviceDataBroker = null;
MasterSalFacade(final RemoteDeviceId id,
- final Broker domBroker,
- final BindingAwareBroker bindingBroker,
- final ActorSystem actorSystem,
- final ActorRef masterActorRef) {
+ final Broker domBroker,
+ final BindingAwareBroker bindingBroker,
+ final ActorSystem actorSystem,
+ final ActorRef masterActorRef,
+ final Timeout actorResponseWaitTime) {
this.id = id;
this.salProvider = new NetconfDeviceSalProvider(id);
this.actorSystem = actorSystem;
this.masterActorRef = masterActorRef;
+ this.actorResponseWaitTime = actorResponseWaitTime;
registerToSal(domBroker, bindingBroker);
}
final NetconfDeviceNotificationService notificationService = new NetconfDeviceNotificationService();
- LOG.info("Creating master data broker for device {}", id);
+ LOG.info("{}: Creating master data broker for device", id);
- final NetconfDOMTransaction masterDOMTransactions =
- new NetconfMasterDOMTransaction(id, remoteSchemaContext, deviceRpc, netconfSessionPreferences);
- deviceDataBroker =
- new NetconfDOMDataBroker(actorSystem, id, masterDOMTransactions);
+ 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);
salProvider.getMountInstance()
- .onTopologyDeviceConnected(remoteSchemaContext, deviceDataBroker, deviceRpc, notificationService);
+ .onTopologyDeviceConnected(remoteSchemaContext, proxyDataBroker, deviceRpc, notificationService);
}
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(SimpleDateFormatUtil.getRevisionFormat().format(mi.getRevision())))))
+ (SimpleDateFormatUtil.DEFAULT_DATE_REV == mi.getRevision() ? Optional.<String>absent() :
+ Optional.of(mi.getQNameModule().getFormattedRevision()))))
.collect(Collectors.toList());
// send initial data to master actor and create actor for providing it
- return Patterns.ask(masterActorRef, new CreateInitialMasterActorData(deviceDataBroker, sourceIdentifiers),
- NetconfTopologyUtils.TIMEOUT);
+ return Patterns.ask(masterActorRef, new CreateInitialMasterActorData(deviceDataBroker, sourceIdentifiers,
+ deviceRpc), actorResponseWaitTime);
}
private void updateDeviceData() {
- Cluster cluster = Cluster.get(actorSystem);
+ final Cluster cluster = Cluster.get(actorSystem);
salProvider.getTopologyDatastoreAdapter().updateClusteredDeviceData(true, cluster.selfAddress().toString(),
netconfSessionPreferences.getNetconfDeviceCapabilities());
}
try {
resource.close();
} catch (final Exception e) {
- LOG.warn("{}: Ignoring exception while closing {}", id, resource, e);
+ LOG.error("{}: Ignoring exception while closing {}", id, resource, e);
}
}
}