X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=apps%2Fcallhome-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fcallhome%2Fmount%2FCallHomeTopology.java;h=d3dceb1bf3cd169e1dcf265b161da8e5ff6f8cb1;hb=493d1f617e491d0c4deb8f49079eecf0864f8d80;hp=934f964a8d9693a0ac2d56183973a28c7aea1865;hpb=1d802172c8b176cc51674f5dbf570ee1bd32fcd6;p=netconf.git

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java
index 934f964a8d..d3dceb1bf3 100644
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java
@@ -7,9 +7,7 @@
  */
 package org.opendaylight.netconf.callhome.mount;
 
-import com.google.common.annotations.VisibleForTesting;
 import io.netty.util.Timer;
-import java.util.concurrent.Executor;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.netconf.client.NetconfClientFactory;
@@ -18,26 +16,26 @@ import org.opendaylight.netconf.client.mdsal.api.DeviceActionFactory;
 import org.opendaylight.netconf.client.mdsal.api.SchemaResourceManager;
 import org.opendaylight.netconf.topology.spi.AbstractNetconfTopology;
 import org.opendaylight.netconf.topology.spi.NetconfClientConfigurationBuilderFactory;
+import org.opendaylight.netconf.topology.spi.NetconfTopologySchemaAssembler;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 
 // Non-final for mocking
-public class CallHomeTopology extends AbstractNetconfTopology {
-    public CallHomeTopology(final String topologyId, final NetconfClientFactory clientFactory, final Timer timer,
-            final Executor processingExecutor, final SchemaResourceManager schemaRepositoryProvider,
+class CallHomeTopology extends AbstractNetconfTopology {
+    CallHomeTopology(final String topologyId, final NetconfClientFactory clientFactory, final Timer timer,
+            final NetconfTopologySchemaAssembler schemaAssembler, final SchemaResourceManager schemaRepositoryProvider,
             final DataBroker dataBroker, final DOMMountPointService mountPointService,
             final NetconfClientConfigurationBuilderFactory builderFactory, final BaseNetconfSchemas baseSchemas,
             final DeviceActionFactory deviceActionFactory) {
-        super(topologyId, clientFactory, timer, processingExecutor, schemaRepositoryProvider, dataBroker,
+        super(topologyId, clientFactory, timer, schemaAssembler, schemaRepositoryProvider, dataBroker,
             mountPointService, builderFactory, deviceActionFactory, baseSchemas);
     }
 
-    void disconnectNode(final NodeId nodeId) {
+    void disableNode(final NodeId nodeId) {
         deleteNode(nodeId);
     }
 
-    @VisibleForTesting
-    public void connectNode(final Node node) {
+    void enableNode(final Node node) {
         ensureNode(node);
     }
 }