Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add slave/master end-to-end test
[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 d8df4c36f5f97a4672e9563cce20a011c2710872..2560d7bd2f031758b44a1b71eef3336ba894a0e9 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
@@
-62,8
+62,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
remoteDeviceId = NetconfTopologyUtils.createRemoteDeviceId(netconfTopologyDeviceSetup.getNode().getNodeId(),
netconfTopologyDeviceSetup.getNode().getAugmentation(NetconfNode.class));
remoteDeviceId = NetconfTopologyUtils.createRemoteDeviceId(netconfTopologyDeviceSetup.getNode().getNodeId(),
netconfTopologyDeviceSetup.getNode().getAugmentation(NetconfNode.class));
- remoteDeviceConnector = new RemoteDeviceConnectorImpl(netconfTopologyDeviceSetup, remoteDeviceId,
- actorResponseWaitTime, mountService);
+ remoteDeviceConnector = new RemoteDeviceConnectorImpl(netconfTopologyDeviceSetup, remoteDeviceId);
netconfNodeManager = createNodeDeviceManager();
}
netconfNodeManager = createNodeDeviceManager();
}
@@
-88,7
+87,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
actorResponseWaitTime, mountService),
NetconfTopologyUtils.createMasterActorName(remoteDeviceId.getName(), masterAddress));
actorResponseWaitTime, mountService),
NetconfTopologyUtils.createMasterActorName(remoteDeviceId.getName(), masterAddress));
- remoteDeviceConnector.startRemoteDeviceConnection(
masterActorRef
);
+ remoteDeviceConnector.startRemoteDeviceConnection(
newMasterSalFacade()
);
}
}
}
}
@@
-148,8
+147,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
if (!isMaster) {
netconfNodeManager.refreshDevice(netconfTopologyDeviceSetup, remoteDeviceId);
}
if (!isMaster) {
netconfNodeManager.refreshDevice(netconfTopologyDeviceSetup, remoteDeviceId);
}
- remoteDeviceConnector = new RemoteDeviceConnectorImpl(netconfTopologyDeviceSetup, remoteDeviceId,
- actorResponseWaitTime, mountService);
+ remoteDeviceConnector = new RemoteDeviceConnectorImpl(netconfTopologyDeviceSetup, remoteDeviceId);
if (isMaster) {
final Future<Object> future = Patterns.ask(masterActorRef, new RefreshSetupMasterActorData(
if (isMaster) {
final Future<Object> future = Patterns.ask(masterActorRef, new RefreshSetupMasterActorData(
@@
-162,7
+160,7
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
LOG.error("Failed to refresh master actor data: {}", failure);
return;
}
LOG.error("Failed to refresh master actor data: {}", failure);
return;
}
- remoteDeviceConnector.startRemoteDeviceConnection(
masterActorRef
);
+ remoteDeviceConnector.startRemoteDeviceConnection(
newMasterSalFacade()
);
}
}, netconfTopologyDeviceSetup.getActorSystem().dispatcher());
}
}
}, netconfTopologyDeviceSetup.getActorSystem().dispatcher());
}
@@
-181,4
+179,9
@@
class NetconfTopologyContext implements ClusterSingletonService, AutoCloseable {
masterActorRef = null;
}
}
masterActorRef = null;
}
}
+
+ protected MasterSalFacade newMasterSalFacade() {
+ return new MasterSalFacade(remoteDeviceId, netconfTopologyDeviceSetup.getActorSystem(), masterActorRef,
+ actorResponseWaitTime, mountService, netconfTopologyDeviceSetup.getDataBroker());
+ }
}
}