Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Custom scheme-cache-directory yang models are not replicated among
[netconf.git]
/
netconf
/
netconf-topology-singleton
/
src
/
main
/
java
/
org
/
opendaylight
/
netconf
/
topology
/
singleton
/
impl
/
NetconfTopologyContext.java
diff --git
a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyContext.java
b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyContext.java
index 7275be18e6aaeda1620cffcf57e4557882d6c29f..4d101833efb93b2c9f1ea0436b8bafdd7ce046b9 100644
(file)
--- a/
netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyContext.java
+++ b/
netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyContext.java
@@
-5,11
+5,8
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* 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;
package org.opendaylight.netconf.topology.singleton.impl;
-import static org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologyUtils.DEFAULT_SCHEMA_REPOSITORY;
-
import akka.actor.ActorRef;
import akka.cluster.Cluster;
import akka.dispatch.OnComplete;
import akka.actor.ActorRef;
import akka.cluster.Cluster;
import akka.dispatch.OnComplete;
@@
-19,8
+16,7
@@
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
@@
-83,8
+79,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
final String masterAddress =
Cluster.get(netconfTopologyDeviceSetup.getActorSystem()).selfAddress().toString();
masterActorRef = netconfTopologyDeviceSetup.getActorSystem().actorOf(NetconfNodeActor.props(
final String masterAddress =
Cluster.get(netconfTopologyDeviceSetup.getActorSystem()).selfAddress().toString();
masterActorRef = netconfTopologyDeviceSetup.getActorSystem().actorOf(NetconfNodeActor.props(
- netconfTopologyDeviceSetup, remoteDeviceId, DEFAULT_SCHEMA_REPOSITORY, DEFAULT_SCHEMA_REPOSITORY,
- actorResponseWaitTime, mountService),
+ netconfTopologyDeviceSetup, remoteDeviceId, actorResponseWaitTime, mountService),
NetconfTopologyUtils.createMasterActorName(remoteDeviceId.getName(), masterAddress));
remoteDeviceConnector.startRemoteDeviceConnection(newMasterSalFacade());
NetconfTopologyUtils.createMasterActorName(remoteDeviceId.getName(), masterAddress));
remoteDeviceConnector.startRemoteDeviceConnection(newMasterSalFacade());
@@
-120,7
+115,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
}
@Override
}
@Override
- public void close()
throws Exception
{
+ public void close() {
if (!closed.compareAndSet(false, true)) {
return;
}
if (!closed.compareAndSet(false, true)) {
return;
}
@@
-136,7
+131,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
* Refresh, if configuration data was changed.
* @param setup new setup
*/
* Refresh, if configuration data was changed.
* @param setup new setup
*/
- void refresh(
@Nonnull
final NetconfTopologySetup setup) {
+ void refresh(final NetconfTopologySetup setup) {
netconfTopologyDeviceSetup = Preconditions.checkNotNull(setup);
remoteDeviceId = NetconfTopologyUtils.createRemoteDeviceId(netconfTopologyDeviceSetup.getNode().getNodeId(),
netconfTopologyDeviceSetup.getNode().augmentation(NetconfNode.class));
netconfTopologyDeviceSetup = Preconditions.checkNotNull(setup);
remoteDeviceId = NetconfTopologyUtils.createRemoteDeviceId(netconfTopologyDeviceSetup.getNode().getNodeId(),
netconfTopologyDeviceSetup.getNode().augmentation(NetconfNode.class));
@@
-155,9
+150,9
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
future.onComplete(new OnComplete<Object>() {
@Override
future.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) {
if (failure != null) {
- LOG.error("Failed to refresh master actor data
: {}
", failure);
+ LOG.error("Failed to refresh master actor data", failure);
return;
}
remoteDeviceConnector.startRemoteDeviceConnection(newMasterSalFacade());
return;
}
remoteDeviceConnector.startRemoteDeviceConnection(newMasterSalFacade());