Migrate netconf-topology to new transport

[netconf.git] / apps / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / impl / utils / NetconfTopologySetup.java

diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
index ab199f69001d7d5d071c9f009c90dffc9d763489..6ac1722993b36c074e02a3252a436830ebc5d591 100644 (file)
--- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
+++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
@@ -10,75 +10,53 @@ package org.opendaylight.netconf.topology.singleton.impl.utils;
 import static java.util.Objects.requireNonNull;
 
 import akka.actor.ActorSystem;
-import com.google.common.util.concurrent.ListeningExecutorService;
 import io.netty.util.concurrent.EventExecutor;
 import java.time.Duration;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledExecutorService;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.dom.api.DOMActionProviderService;
-import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.netconf.client.NetconfClientDispatcher;
-import org.opendaylight.netconf.sal.connect.netconf.NetconfDevice;
-import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.BaseNetconfSchemas;
+import org.opendaylight.netconf.client.NetconfClientFactory;
+import org.opendaylight.netconf.client.mdsal.NetconfDevice;
+import org.opendaylight.netconf.client.mdsal.api.BaseNetconfSchemas;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class NetconfTopologySetup {
-
     private final ClusterSingletonServiceProvider clusterSingletonServiceProvider;
-    private final DOMRpcProviderService rpcProviderRegistry;
-    private final DOMActionProviderService actionProviderRegistry;
     private final DataBroker dataBroker;
     private final InstanceIdentifier<Node> instanceIdentifier;
     private final Node node;
     private final ScheduledExecutorService keepaliveExecutor;
-    private final ListeningExecutorService processingExecutor;
+    private final Executor processingExecutor;
     private final ActorSystem actorSystem;
     private final EventExecutor eventExecutor;
-    private final NetconfClientDispatcher netconfClientDispatcher;
+    private final NetconfClientFactory netconfClientFactory;
     private final String topologyId;
     private final NetconfDevice.SchemaResourcesDTO schemaResourceDTO;
     private final Duration idleTimeout;
-    private final String privateKeyPath;
-    private final String privateKeyPassphrase;
-    private final AAAEncryptionService encryptionService;
     private final BaseNetconfSchemas baseSchemas;
 
     NetconfTopologySetup(final NetconfTopologySetupBuilder builder) {
-        this.clusterSingletonServiceProvider = builder.getClusterSingletonServiceProvider();
-        this.rpcProviderRegistry = builder.getRpcProviderRegistry();
-        this.actionProviderRegistry = builder.getActionProviderRegistry();
-        this.dataBroker = builder.getDataBroker();
-        this.instanceIdentifier = builder.getInstanceIdentifier();
-        this.node = builder.getNode();
-        this.keepaliveExecutor = builder.getKeepaliveExecutor();
-        this.processingExecutor = builder.getProcessingExecutor();
-        this.actorSystem = builder.getActorSystem();
-        this.eventExecutor = builder.getEventExecutor();
-        this.netconfClientDispatcher = builder.getNetconfClientDispatcher();
-        this.topologyId = builder.getTopologyId();
-        this.schemaResourceDTO = builder.getSchemaResourceDTO();
-        this.idleTimeout = builder.getIdleTimeout();
-        this.privateKeyPath = builder.getPrivateKeyPath();
-        this.privateKeyPassphrase = builder.getPrivateKeyPassphrase();
-        this.encryptionService = builder.getEncryptionService();
-        this.baseSchemas = builder.getBaseSchemas();
+        clusterSingletonServiceProvider = builder.getClusterSingletonServiceProvider();
+        dataBroker = builder.getDataBroker();
+        instanceIdentifier = builder.getInstanceIdentifier();
+        node = builder.getNode();
+        keepaliveExecutor = builder.getKeepaliveExecutor();
+        processingExecutor = builder.getProcessingExecutor();
+        actorSystem = builder.getActorSystem();
+        eventExecutor = builder.getEventExecutor();
+        netconfClientFactory = builder.getNetconfClientFactory();
+        topologyId = builder.getTopologyId();
+        schemaResourceDTO = builder.getSchemaResourceDTO();
+        idleTimeout = builder.getIdleTimeout();
+        baseSchemas = builder.getBaseSchemas();
     }
 
     public ClusterSingletonServiceProvider getClusterSingletonServiceProvider() {
         return clusterSingletonServiceProvider;
     }
 
-    public DOMRpcProviderService getRpcProviderRegistry() {
-        return rpcProviderRegistry;
-    }
-
-    public DOMActionProviderService getActionProviderRegistry() {
-        return actionProviderRegistry;
-    }
-
     public DataBroker getDataBroker() {
         return dataBroker;
     }
@@ -91,7 +69,7 @@ public class NetconfTopologySetup {
         return node;
     }
 
-    public ListeningExecutorService getProcessingExecutor() {
+    public Executor getProcessingExecutor() {
         return processingExecutor;
     }
 
@@ -111,8 +89,8 @@ public class NetconfTopologySetup {
         return topologyId;
     }
 
-    public NetconfClientDispatcher getNetconfClientDispatcher() {
-        return netconfClientDispatcher;
+    public NetconfClientFactory getNetconfClientFactory() {
+        return netconfClientFactory;
     }
 
     public NetconfDevice.SchemaResourcesDTO getSchemaResourcesDTO() {
@@ -123,40 +101,23 @@ public class NetconfTopologySetup {
         return idleTimeout;
     }
 
-    public String getPrivateKeyPath() {
-        return privateKeyPath;
-    }
-
-    public String getPrivateKeyPassphrase() {
-        return privateKeyPassphrase;
-    }
-
-    public AAAEncryptionService getEncryptionService() {
-        return encryptionService;
-    }
-
     public BaseNetconfSchemas getBaseSchemas() {
         return baseSchemas;
     }
 
     public static class NetconfTopologySetupBuilder {
         private ClusterSingletonServiceProvider clusterSingletonServiceProvider;
-        private DOMRpcProviderService rpcProviderRegistry;
-        private DOMActionProviderService actionProviderRegistry;
         private DataBroker dataBroker;
         private InstanceIdentifier<Node> instanceIdentifier;
         private Node node;
         private ScheduledExecutorService keepaliveExecutor;
-        private ListeningExecutorService processingExecutor;
+        private Executor processingExecutor;
         private ActorSystem actorSystem;
         private EventExecutor eventExecutor;
         private String topologyId;
-        private NetconfClientDispatcher netconfClientDispatcher;
+        private NetconfClientFactory netconfClientFactory;
         private NetconfDevice.SchemaResourcesDTO schemaResourceDTO;
         private Duration idleTimeout;
-        private String privateKeyPath;
-        private String privateKeyPassphrase;
-        private AAAEncryptionService encryptionService;
         private BaseNetconfSchemas baseSchemas;
 
         public NetconfTopologySetupBuilder() {
@@ -182,25 +143,6 @@ public class NetconfTopologySetup {
             return this;
         }
 
-        DOMRpcProviderService getRpcProviderRegistry() {
-            return rpcProviderRegistry;
-        }
-
-        public NetconfTopologySetupBuilder setRpcProviderRegistry(final DOMRpcProviderService rpcProviderRegistry) {
-            this.rpcProviderRegistry = rpcProviderRegistry;
-            return this;
-        }
-
-        DOMActionProviderService getActionProviderRegistry() {
-            return actionProviderRegistry;
-        }
-
-        public NetconfTopologySetupBuilder setActionProviderRegistry(
-            final DOMActionProviderService actionProviderRegistry) {
-            this.actionProviderRegistry = actionProviderRegistry;
-            return this;
-        }
-
         DataBroker getDataBroker() {
             return dataBroker;
         }
@@ -241,11 +183,11 @@ public class NetconfTopologySetup {
             return this;
         }
 
-        ListeningExecutorService getProcessingExecutor() {
+        Executor getProcessingExecutor() {
             return processingExecutor;
         }
 
-        public NetconfTopologySetupBuilder setProcessingExecutor(final ListeningExecutorService processingExecutor) {
+        public NetconfTopologySetupBuilder setProcessingExecutor(final Executor processingExecutor) {
             this.processingExecutor = processingExecutor;
             return this;
         }
@@ -277,12 +219,12 @@ public class NetconfTopologySetup {
             return this;
         }
 
-        NetconfClientDispatcher getNetconfClientDispatcher() {
-            return netconfClientDispatcher;
+        NetconfClientFactory getNetconfClientFactory() {
+            return netconfClientFactory;
         }
 
-        public NetconfTopologySetupBuilder setNetconfClientDispatcher(final NetconfClientDispatcher clientDispatcher) {
-            this.netconfClientDispatcher = clientDispatcher;
+        public NetconfTopologySetupBuilder setNetconfClientFactory(final NetconfClientFactory clientFactory) {
+            netconfClientFactory = clientFactory;
             return this;
         }
 
@@ -305,33 +247,6 @@ public class NetconfTopologySetup {
             return idleTimeout;
         }
 
-        public NetconfTopologySetupBuilder setPrivateKeyPath(final String privateKeyPath) {
-            this.privateKeyPath = privateKeyPath;
-            return this;
-        }
-
-        public String getPrivateKeyPath() {
-            return this.privateKeyPath;
-        }
-
-        public NetconfTopologySetupBuilder setPrivateKeyPassphrase(final String privateKeyPassphrase) {
-            this.privateKeyPassphrase = privateKeyPassphrase;
-            return this;
-        }
-
-        public String getPrivateKeyPassphrase() {
-            return this.privateKeyPassphrase;
-        }
-
-        AAAEncryptionService getEncryptionService() {
-            return this.encryptionService;
-        }
-
-        public NetconfTopologySetupBuilder setEncryptionService(final AAAEncryptionService encryptionService) {
-            this.encryptionService = encryptionService;
-            return this;
-        }
-
         public static NetconfTopologySetupBuilder create() {
             return new NetconfTopologySetupBuilder();
         }