X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-topology-singleton%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fsingleton%2Fimpl%2FRemoteDeviceConnectorImplTest.java;h=5855dd44b93bbbfe612178ef50631e9639238f6a;hb=4788b31c2c898c442309f9323580852e0752eae4;hp=a8df0afd38dc9eb590dceb7815448179917ed883;hpb=e1bdc7d1eff9c117a0e3c4559f5e8a0595f53a3f;p=netconf.git

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
index a8df0afd38..5855dd44b9 100644
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java
@@ -23,9 +23,9 @@ import static org.mockito.MockitoAnnotations.initMocks;
 import akka.actor.ActorRef;
 import akka.actor.ActorSystem;
 import akka.util.Timeout;
+import com.google.common.net.InetAddresses;
 import com.google.common.util.concurrent.Futures;
 import io.netty.util.concurrent.EventExecutor;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.concurrent.ExecutorService;
@@ -109,11 +109,11 @@ public class RemoteDeviceConnectorImplTest {
     private RemoteDeviceId remoteDeviceId;
 
     @Before
-    public void setUp() throws UnknownHostException {
+    public void setUp() {
         initMocks(this);
 
         remoteDeviceId = new RemoteDeviceId(TOPOLOGY_ID,
-                new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+                new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999));
 
         doReturn(txChain).when(dataBroker).createTransactionChain(any(TransactionChainListener.class));
         doReturn(writeTx).when(txChain).newWriteOnlyTransaction();
@@ -134,7 +134,8 @@ public class RemoteDeviceConnectorImplTest {
 
     @Test
     public void testStopRemoteDeviceConnection() {
-        final Credentials credentials = new LoginPasswordBuilder().setPassword("admin").setUsername("admin").build();
+        final Credentials credentials = new LoginPasswordBuilder()
+                .setPassword("admin").setUsername("admin").build();
         final NetconfNode netconfNode = new NetconfNodeBuilder()
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(9999))
@@ -150,7 +151,7 @@ public class RemoteDeviceConnectorImplTest {
         builder.setNode(node);
 
 
-        final NetconfDeviceCommunicator communicator = mock (NetconfDeviceCommunicator.class);
+        final NetconfDeviceCommunicator communicator = mock(NetconfDeviceCommunicator.class);
         final RemoteDeviceHandler salFacade = mock(RemoteDeviceHandler.class);
 
         final TestingRemoteDeviceConnectorImpl remoteDeviceConnection =
@@ -173,7 +174,8 @@ public class RemoteDeviceConnectorImplTest {
         final ExecutorService executorService = mock(ExecutorService.class);
         doReturn(executorService).when(processingExecutor).getExecutor();
 
-        final Credentials credentials = new LoginPasswordBuilder().setPassword("admin").setUsername("admin").build();
+        final Credentials credentials = new LoginPasswordBuilder()
+                .setPassword("admin").setUsername("admin").build();
         final NetconfNode netconfNode = new NetconfNodeBuilder()
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(9999))
@@ -199,11 +201,12 @@ public class RemoteDeviceConnectorImplTest {
     }
 
     @Test
-    public void testKeapAliveFacade() throws UnknownHostException {
+    public void testKeapAliveFacade() {
         final ExecutorService executorService = mock(ExecutorService.class);
         doReturn(executorService).when(processingExecutor).getExecutor();
 
-        final Credentials credentials = new LoginPasswordBuilder().setPassword("admin").setUsername("admin").build();
+        final Credentials credentials = new LoginPasswordBuilder()
+                .setPassword("admin").setUsername("admin").build();
         final NetconfNode netconfNode = new NetconfNodeBuilder()
                 .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
                 .setPort(new PortNumber(9999))
@@ -217,7 +220,7 @@ public class RemoteDeviceConnectorImplTest {
                 .build();
 
         final RemoteDeviceId remoteDeviceId = new RemoteDeviceId(TOPOLOGY_ID,
-                new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+                new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999));
         final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build();
         builder.setSchemaResourceDTO(NetconfTopologyUtils.setupSchemaCacheDTO(node));
 
@@ -233,7 +236,7 @@ public class RemoteDeviceConnectorImplTest {
     }
 
     @Test
-    public void testGetClientConfig() throws UnknownHostException {
+    public void testGetClientConfig() {
         final NetconfClientSessionListener listener = mock(NetconfClientSessionListener.class);
         final Host host = new Host(new IpAddress(new Ipv4Address("127.0.0.1")));
         final PortNumber portNumber = new PortNumber(9999);
@@ -255,7 +258,8 @@ public class RemoteDeviceConnectorImplTest {
                 remoteDeviceConnection.getClientConfig(listener, testingNode);
 
         assertEquals(defaultClientConfig.getConnectionTimeoutMillis().longValue(), 1000L);
-        assertEquals(defaultClientConfig.getAddress(), new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+        assertEquals(defaultClientConfig.getAddress(), new InetSocketAddress(InetAddresses.forString("127.0.0.1"),
+            9999));
         assertSame(defaultClientConfig.getSessionListener(), listener);
         assertEquals(defaultClientConfig.getAuthHandler().getUsername(), "testuser");
         assertEquals(defaultClientConfig.getProtocol(), NetconfClientConfiguration.NetconfClientProtocol.TCP);