Remove onRemoteSessionFailed()

This method is only invoked in tests, remove it.

Change-Id: I79a9dda7cc2fc6f181fa881865b4281c66674efc
Signed-off-by: Robert Varga <[email protected]>

diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
index c76596830916fa393e696da342fade14e2a7a114..ab3dd0694b33c7d944d69955f8223d0fb4973f0e 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java
@@ -271,11 +271,6 @@ public final class StressClient {
             LOG.info("Session down");
         }
 
-        @Override
-        public void onRemoteSessionFailed(final Throwable throwable) {
-            LOG.info("Session failed");
-        }
-
         @Override
         public void onNotification(final NetconfMessage notification) {
             LOG.info("Notification received: {}", notification);

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
index 67e5535940b19596f45596bce1eaf866a62f8158..c087d22e44d3a5d6020ca85d4fffd4e6151d9993 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
@@ -314,12 +314,6 @@ public class NetconfDevice implements RemoteDevice<NetconfDeviceCommunicator> {
         resetMessageTransformer();
     }
 
-    @Override
-    public void onRemoteSessionFailed(final Throwable throwable) {
-        setConnected(false);
-        salFacade.onDeviceFailed(throwable);
-    }
-
     @Override
     public void onNotification(final NetconfMessage notification) {
         notificationHandler.handleNotification(notification);

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java
index e646f97d1798c39765a0653ee1bd0f080bb558e0..0cc541a58416b4d31d6ede169b5970fb6d09f095 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java
@@ -67,11 +67,6 @@ public class SchemalessNetconfDevice implements RemoteDevice<NetconfDeviceCommun
         salFacade.onDeviceDisconnected();
     }
 
-    @Override
-    public void onRemoteSessionFailed(final Throwable throwable) {
-        salFacade.onDeviceFailed(throwable);
-    }
-
     @Override
     public void onNotification(final NetconfMessage notification) {
         salFacade.onNotification(messageTransformer.toNotification(notification));

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java
index d90cf7cadb43684f36a0ebcd39017ab29affd4c2..292e8287dd5a69624cc6e514147d0b8fdb0f60a4 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java
@@ -19,9 +19,6 @@ public interface RemoteDevice<L extends RemoteDeviceCommunicator> {
     // FIXME: document this node
     void onRemoteSessionDown();
 
-    // FIXME: document this node
-    void onRemoteSessionFailed(Throwable throwable);
-
     // FIXME: document this node
     void onNotification(NetconfMessage notification);
 }

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
index cc576af006ca83f9870a8478d84daf1478cace66..fc6cb678cf2ea1eb6fbca5a46084d032ecf63804 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java
@@ -41,7 +41,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest {
         final SchemalessMessageTransformer messageTransformer = mock(SchemalessMessageTransformer.class);
         final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("test-D",
                 InetSocketAddress.createUnresolved("localhost", 22));
-        final Throwable throwable = new Throwable();
 
         final SchemalessNetconfDevice device = new SchemalessNetconfDevice(BASE_SCHEMAS, remoteDeviceId, facade,
             messageTransformer);
@@ -60,9 +59,6 @@ public class SchemalessNetconfDeviceTest extends AbstractBaseSchemasTest {
 
         device.onRemoteSessionDown();
         verify(facade).onDeviceDisconnected();
-
-        device.onRemoteSessionFailed(throwable);
-        verify(facade).onDeviceFailed(throwable);
     }
 
     private static RemoteDeviceHandler getFacade() throws Exception {