Flatten callhome-provider

There is no point in separating components here -- flatten them to a
single package. We may end up promoting some of these to
netconf-client-mdsal and/or netconf-topology, but that is a separate
story.

JIRA: NETCONF-590
Change-Id: I1d8d96351b75965849d32028329716075c2da84c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AbstractCallHomeSessionContextManager.java
similarity index 87%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AbstractCallHomeSessionContextManager.java
index 9839c9cf04fa60e023e0e29235618f248b0e655d..232d9cc6fd7be971f6d81fb59cf55ad55b70aaaa 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/AbstractCallHomeSessionContextManager.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AbstractCallHomeSessionContextManager.java
@@ -5,15 +5,14 @@
  * 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.callhome.server;
+package org.opendaylight.netconf.topology.callhome;
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 public abstract class AbstractCallHomeSessionContextManager<T extends CallHomeSessionContext>
         implements CallHomeSessionContextManager<T> {
-
-    protected final Map<String, T> contexts = new ConcurrentHashMap<>();
+    protected final ConcurrentMap<String, T> contexts = new ConcurrentHashMap<>();
 
     @Override
     public void register(final T context) {

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/AuthorizedKeysDecoder.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AuthorizedKeysDecoder.java
similarity index 99%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/AuthorizedKeysDecoder.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AuthorizedKeysDecoder.java
index 877992096756e5a12cc2966713080c076454935c..e666ed1d1a3c6dacc0c0e53fdb1ec6d0931f7046 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/AuthorizedKeysDecoder.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/AuthorizedKeysDecoder.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.ByteArrayOutputStream;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountService.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountService.java
similarity index 94%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountService.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountService.java
index 9086c978e7263bcfe934241d4ff825e7e6783932..7d3b7c0f8cb196f7831e71af6b18e313c635e649 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountService.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountService.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -20,12 +20,6 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshSessionContext;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshSessionContextManager;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsAuthProvider;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsSessionContext;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsSessionContextManager;
 import org.opendaylight.netconf.client.NetconfClientFactory;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
@@ -92,8 +86,7 @@ import org.osgi.service.component.annotations.Reference;
  *
  * <ul>
  *     <li>When incoming connection is identified the {@link CallHomeSshSessionContext} instance expected to be created.
- *     The createContext() method is invoked within protocol associated
- *     {@link org.opendaylight.netconf.callhome.server.CallHomeSessionContextManager CallHomeSessionContextManager} --
+ *     The createContext() method is invoked within protocol associated {@link CallHomeSessionContextManager} --
  *     see {@link #createSshSessionContextManager()} and
  *     {@link #createTlsSessionContextManager(CallHomeTlsAuthProvider, CallHomeStatusRecorder)}</li>
  *     <li>Due to both {@link NetconfClientSessionListener} and {@link SettableFuture} are required to build session
@@ -101,8 +94,7 @@ import org.osgi.service.component.annotations.Reference;
  *     composed via {@link #asNode(String, SocketAddress, Protocol)}. This triggers Netconf client construct/connect
  *     logic (as explained above) resulting captured object placed into {@link #netconfLayerMapping}.</li>
  *     <li>Accepted instance of {@link NetconfClientSessionListener} is used to establish Netconf layer --
- *     see {@link org.opendaylight.netconf.callhome.server.CallHomeTransportChannelListener
- *     CallHomeTransportChannelListener} </li>
+ *     see {@link CallHomeTransportChannelListener}</li>
  *     <li>Accepted instance of {@link SettableFuture} (representing connection to remote device) is used to
  *     signal connection state to topology component</li>
  * </ul>

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSshAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountSshAuthProvider.java
similarity index 98%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSshAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountSshAuthProvider.java
index a3471aeb698400695c89f3d360b635d91138f30e..b17e8edb4b67cf573d0026258292812a7922ed4f 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSshAuthProvider.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountSshAuthProvider.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -24,8 +24,6 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshAuthProvider;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshAuthSettings;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.NetconfCallhomeServer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.SshPublicKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.credentials.Credentials;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountStatusReporter.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountStatusReporter.java
similarity index 98%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountStatusReporter.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountStatusReporter.java
index c479a69505e189c1d1f6c4f4050b6fce9a57f6d3..c69ef4b58b16309a56c8621d9f9595921b421b97 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountStatusReporter.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountStatusReporter.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
@@ -24,7 +24,6 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.NetconfCallhomeServer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.SshPublicKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev240129.netconf.callhome.server.AllowedDevices;
@@ -60,7 +59,7 @@ public final class CallHomeMountStatusReporter implements CallHomeStatusRecorder
     @Inject
     public CallHomeMountStatusReporter(final @Reference DataBroker broker) {
         dataBroker = broker;
-        syncReg = dataBroker.registerDataTreeChangeListener(
+        syncReg = dataBroker.registerLegacyTreeChangeListener(
             DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, ALL_DEVICES_II.child(Device.class)),
             this::onConfigurationDataTreeChanged);
     }

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/CallHomeMountTlsAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountTlsAuthProvider.java
similarity index 98%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/CallHomeMountTlsAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountTlsAuthProvider.java
index 0eb6c9d8548dd75fb259f09739dbe3930f557aad..1a2d469b1e62a997bdb8103fcebb58c2f975c1be 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/CallHomeMountTlsAuthProvider.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeMountTlsAuthProvider.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import com.google.common.collect.ImmutableMultimap;
 import io.netty.handler.ssl.SslContext;
@@ -24,7 +24,6 @@ import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsAuthProvider;
 import org.opendaylight.netconf.client.SslContextFactory;
 import org.opendaylight.netconf.client.mdsal.api.SslContextFactoryProvider;
 import org.opendaylight.netconf.keystore.legacy.NetconfKeystore;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContext.java
similarity index 96%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContext.java
index cf28f554101dad69e867d9547f569965477e4b65..28d95f528ea0de6a13fb199e6c47709d1ed182b4 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContext.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContext.java
@@ -5,7 +5,7 @@
  * 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.callhome.server;
+package org.opendaylight.netconf.topology.callhome;
 
 import com.google.common.util.concurrent.SettableFuture;
 import org.opendaylight.netconf.client.NetconfClientSession;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContextManager.java
similarity index 97%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContextManager.java
index 875cc2f58114cfb7cce9fe2deca2882801fc06dc..172311fa2f0598eefaea39d91bd05ac6cc4df944 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeSessionContextManager.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSessionContextManager.java
@@ -5,7 +5,7 @@
  * 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.callhome.server;
+package org.opendaylight.netconf.topology.callhome;
 
 import io.netty.channel.Channel;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthProvider.java
similarity index 95%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthProvider.java
index 6d0fd78e4b83a2208675fcf23bbcaab47937566c..2e74142980eeab44b84e7355e71f8006563b41c4 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthProvider.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthProvider.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.net.SocketAddress;
 import java.security.PublicKey;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthSettings.java
similarity index 97%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthSettings.java
index a76c2fee92aa0f41f0896e2eed1f56615431b703..b93a37ead9076cc7dfaf9c456fd79be0c5f3b68f 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshAuthSettings.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshAuthSettings.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServer.java
similarity index 98%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServer.java
index 5708f5d448c18ecc21e036722593426dff435f18..d51abd8bebc547c2911f173f73bf0ac96ad25074 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServer.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServer.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
@@ -19,8 +19,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.netconf.api.TransportConstants;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.CallHomeTransportChannelListener;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.shaded.sshd.client.auth.password.UserAuthPasswordFactory;
 import org.opendaylight.netconf.shaded.sshd.client.auth.pubkey.UserAuthPublicKeyFactory;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContext.java
similarity index 92%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContext.java
index 564e47f73893aaf0cfe10f277d5ae1bdd099493d..2514d386f9431da704974a54c47da3e39d2dd989 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContext.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContext.java
@@ -5,14 +5,13 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.util.concurrent.SettableFuture;
 import java.net.SocketAddress;
-import org.opendaylight.netconf.callhome.server.CallHomeSessionContext;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
 import org.opendaylight.netconf.shaded.sshd.client.session.ClientSession;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContextManager.java
similarity index 94%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContextManager.java
index 0c69d6930eae1e9139483cf91f0a7c824731e365..ae4b3d7808a213345dde2494fb49ce33dd42d647 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshSessionContextManager.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeSshSessionContextManager.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
@@ -14,7 +14,6 @@ import io.netty.channel.Channel;
 import java.net.SocketAddress;
 import java.util.Map;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.netconf.callhome.server.AbstractCallHomeSessionContextManager;
 import org.opendaylight.netconf.client.SimpleNetconfClientSessionListener;
 import org.opendaylight.netconf.shaded.sshd.client.session.ClientSession;
 

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeStatusRecorder.java
similarity index 97%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeStatusRecorder.java
index 79c813310e4c23c58fa5b873e47a55c1824a99f2..72c5e9164fe3516222b29714d36b8b0e09b92b6d 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeStatusRecorder.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeStatusRecorder.java
@@ -5,7 +5,7 @@
  * 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.callhome.server;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.net.SocketAddress;
 import java.security.PublicKey;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsAuthProvider.java
similarity index 92%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsAuthProvider.java
index a161b18349596012ed97e646a3dfeea9c4c16b57..e0d29cbded94e43429c8935d3f9539873d6f658a 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsAuthProvider.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsAuthProvider.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.security.PublicKey;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServer.java
similarity index 96%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServer.java
index 4fccee7566f3abb10888fdc8aed5c9fccc515005..b249a2e198b34a255eb7bdbf608426d9c2dfc220 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServer.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServer.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
@@ -15,8 +15,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.CallHomeTransportChannelListener;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.transport.api.UnsupportedConfigurationException;
 import org.opendaylight.netconf.transport.tcp.BootstrapFactory;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContext.java
similarity index 91%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContext.java
index 221949e76381bf9be483500702d5d79732d72a0d..c3a038ae87ec500bc621cab9cb563d1f4bf5cdce 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContext.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContext.java
@@ -5,14 +5,13 @@
  * 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.callhome.server.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.util.concurrent.SettableFuture;
 import io.netty.channel.Channel;
-import org.opendaylight.netconf.callhome.server.CallHomeSessionContext;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
 

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContextManager.java
similarity index 94%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContextManager.java
index 9a3fee62827971daf6454d0e557e51bcba5e6cec..0e33831b52d7b7b01da0e598cd2cf16c0136c4ce 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsSessionContextManager.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsSessionContextManager.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 
@@ -14,8 +14,6 @@ import io.netty.channel.Channel;
 import io.netty.handler.ssl.SslHandler;
 import java.security.PublicKey;
 import javax.net.ssl.SSLPeerUnverifiedException;
-import org.opendaylight.netconf.callhome.server.AbstractCallHomeSessionContextManager;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
 import org.opendaylight.netconf.client.SimpleNetconfClientSessionListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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/topology/callhome/CallHomeTopology.java
similarity index 97%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTopology.java
index 2606467a6e7f3b08495f46103561f1a6752de914..b9cf85a9a53bad1ff33161c6ff8590c149010ab1 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeTopology.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTopology.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTransportChannelListener.java
similarity index 98%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTransportChannelListener.java
index 54d9a05768f96baef08ed2b51213f3bff632329f..12e446c39ffd926c29c00a543515f567f23fd308 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/server/CallHomeTransportChannelListener.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/CallHomeTransportChannelListener.java
@@ -5,7 +5,7 @@
  * 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.callhome.server;
+package org.opendaylight.netconf.topology.callhome;
 
 import static java.util.Objects.requireNonNull;
 

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/IetfZeroTouchCallHomeServerProvider.java
similarity index 92%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/IetfZeroTouchCallHomeServerProvider.java
index 89d05b64a4b8015f0265316f46f6b4993836d73a..571e86ae78f73d81a1ffd4da272b4afe3aaa6aba 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/IetfZeroTouchCallHomeServerProvider.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/IetfZeroTouchCallHomeServerProvider.java
@@ -5,16 +5,13 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshAuthProvider;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshServer;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.common.NetconfTimer;
 import org.osgi.service.component.annotations.Activate;

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
similarity index 90%
rename from apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java
rename to apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
index 9a8a3a076e81501bc4fa46cfcf8bdfa529041eaa..ae23d84e35931b3c0b855c7a1ad73270605134b8 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/tls/NetconfCallHomeTlsService.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/topology/callhome/NetconfCallHomeTlsService.java
@@ -5,17 +5,13 @@
  * 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.callhome.mount.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import org.opendaylight.netconf.callhome.mount.CallHomeMountService;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsAuthProvider;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsServer;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.common.NetconfTimer;
 import org.osgi.service.component.annotations.Activate;

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountServiceTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
similarity index 96%
rename from apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountServiceTest.java
rename to apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
index 51f52cb4fc03409f3552ac95c5fa647d06124010..27b3d0bd9b0eb90c232db19a31f357a6c94dc5fa 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountServiceTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeMountServiceTest.java
@@ -5,7 +5,7 @@
  * 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.callhome.mount;
+package org.opendaylight.netconf.topology.callhome;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -28,8 +28,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.tls.CallHomeTlsAuthProvider;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
 import org.opendaylight.netconf.shaded.sshd.client.session.ClientSession;

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
similarity index 98%
rename from apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java
rename to apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
index 95527aabe6113c2b04a5d289faa22bf9e87a846a..aa327d43817dad9aa44d04d8113caa80dfa29133 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/ssh/CallHomeSshServerTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeSshServerTest.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.ssh;
+package org.opendaylight.netconf.topology.callhome;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -33,8 +33,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
-import org.opendaylight.netconf.callhome.server.ssh.CallHomeSshAuthSettings.DefaultAuthSettings;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
@@ -52,6 +50,7 @@ import org.opendaylight.netconf.shaded.sshd.server.auth.password.PasswordAuthent
 import org.opendaylight.netconf.shaded.sshd.server.auth.password.UserAuthPasswordFactory;
 import org.opendaylight.netconf.shaded.sshd.server.auth.pubkey.PublickeyAuthenticator;
 import org.opendaylight.netconf.shaded.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
+import org.opendaylight.netconf.topology.callhome.CallHomeSshAuthSettings.DefaultAuthSettings;
 import org.opendaylight.netconf.transport.ssh.SSHServer;
 import org.opendaylight.netconf.transport.ssh.SSHTransportStackFactory;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;

diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
similarity index 99%
rename from apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java
rename to apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
index 54a7303e3c50987e823febbbde1f56a7c38d99c9..5e15ef2cbe6a927feb922843796eff2b2d91082e 100644 (file)
--- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/server/tls/CallHomeTlsServerTest.java
+++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/topology/callhome/CallHomeTlsServerTest.java
@@ -5,7 +5,7 @@
  * 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.callhome.server.tls;
+package org.opendaylight.netconf.topology.callhome;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -53,7 +53,6 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.opendaylight.netconf.callhome.server.CallHomeStatusRecorder;
 import org.opendaylight.netconf.client.NetconfClientSession;
 import org.opendaylight.netconf.client.NetconfClientSessionListener;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;