Rename netconf-ssh test packages

Change-Id: I0a19631cdb4ce567f6d8a2f222b49b38641751a9
Signed-off-by: Tomas Cere <tcere@cisco.com>

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClient.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClient.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java
index bdaee7957d277ef7bff5c9aafb81e1e0fcd85cb5..c8584a7ed8cb608aa34279aba1e866ea37fe34c4 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClient.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClient.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClientHandler.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClientHandler.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java
index 1d3cd5325cb99f77c40a270f8963abd2ed2e3a12..ccc63f6513923e6c7a563e3330ed4ec3324cc73b 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoClientHandler.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoClientHandler.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import static com.google.common.base.Preconditions.checkState;
 

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServer.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServer.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
index c53544fef1e142724e7a9517d8b2f44380106267..53a54dc601ef6525c5d3aa6cb638b7a39100352c 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServer.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServer.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServerHandler.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java
similarity index 97%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServerHandler.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java
index abb6658b11a7dcfff730ded38b096aa22349bd6a..ea157e04ac08a752de2fca56f32f7ab119889ae3 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/EchoServerHandler.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/EchoServerHandler.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import com.google.common.base.Charsets;
 import com.google.common.base.Splitter;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServer.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServer.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
index 7f6edafe264d39112f47aac01702b4401f95738d..8294a35c954b3326f42c87d27466907f83aec515 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServer.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServer.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServerHandler.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServerHandler.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java
index e633ab2332dde4a7426b7ebb8cef9b1efdc73000..43296d0b1c20256e82191714a62422ab24be8264 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/ProxyServerHandler.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/ProxyServerHandler.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import com.google.common.base.Charsets;
 import io.netty.bootstrap.Bootstrap;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java
similarity index 97%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java
index 83e7876b5b4a14b156fbc78abc98c9b64222c7a7..d5aefbb7726286f78b0e6744ca01b018bd7ec093 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/netty/SSHTest.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/netty/SSHTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.netty;
+package org.opendaylight.netconf.netty;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -32,7 +32,7 @@ import org.apache.sshd.server.session.ServerSession;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.opendaylight.controller.netconf.netty.EchoClientHandler.State;
+import org.opendaylight.netconf.netty.EchoClientHandler.State;
 import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.LoginPassword;
 import org.opendaylight.netconf.nettyutil.handler.ssh.client.AsyncSshHandler;
 import org.opendaylight.netconf.ssh.SshProxyServer;

diff --git a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/ssh/authentication/SSHServerTest.java b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java
similarity index 98%
rename from opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/ssh/authentication/SSHServerTest.java
rename to opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.java
index 79073d7da0c7b99ccbc43a617a64127a295059d1..ecef31338766eae588d8e4e6b87e104801dc2b34 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/controller/netconf/ssh/authentication/SSHServerTest.java
+++ b/opendaylight/netconf/netconf-ssh/src/test/java/org/opendaylight/netconf/ssh/authentication/SSHServerTest.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.controller.netconf.ssh.authentication;
+package org.opendaylight.netconf.ssh.authentication;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;