We have better alternatives for these, use those.
Change-Id: Ibfcea2779b822d0ff2d113bed4fe218d02f64eb5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.netconf.api.NetconfMessage;
private CallHomeProtocolSessionContext mockProtocol;
@Before
- public void setup() throws UnknownHostException {
- someAddressIpv4 = (Inet4Address) InetAddress.getByName("1.2.3.4");
+ public void setup() {
+ someAddressIpv4 = (Inet4Address) InetAddresses.forString("1.2.3.4");
someSocketAddress = new InetSocketAddress(someAddressIpv4, 123);
mockProtocol = mock(CallHomeProtocolSessionContext.class);
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import java.net.Inet6Address;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.netconf.client.NetconfClientSession;
}
@Test
- public void newContextCanBeCreatedFromASocketAddress() throws UnknownHostException {
+ public void newContextCanBeCreatedFromASocketAddress() {
// given
- Inet4Address someAddressIpv4 = (Inet4Address) InetAddress.getByName("1.2.3.4");
- Inet6Address someAddressIpv6 = (Inet6Address) InetAddress.getByName("::1");
+ Inet4Address someAddressIpv4 = (Inet4Address) InetAddresses.forString("1.2.3.4");
+ Inet6Address someAddressIpv6 = (Inet6Address) InetAddresses.forString("::1");
// and
ContextKey key1 = ContextKey.from(new InetSocketAddress(someAddressIpv4, 123));
ContextKey key2 = ContextKey.from(new InetSocketAddress(someAddressIpv6, 123));
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import java.util.concurrent.Executors;
import org.apache.sshd.server.keyprovider.PEMGeneratorHostKeyProvider;
import org.opendaylight.netconf.api.NetconfServerDispatcher;
import org.opendaylight.netconf.auth.AuthProvider;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.slf4j.Logger;
});
}
- private InetSocketAddress getInetAddress(final String bindingAddress, final String portNumber) {
- try {
- IpAddress ipAddress = IpAddressBuilder.getDefaultInstance(bindingAddress);
- final InetAddress inetAd = InetAddress.getByName(ipAddress.getIpv4Address() == null
- ? ipAddress.getIpv6Address().getValue() : ipAddress.getIpv4Address().getValue());
- return new InetSocketAddress(inetAd, Integer.valueOf(portNumber));
- } catch (final UnknownHostException e) {
- throw new IllegalArgumentException("Unable to bind netconf endpoint to address " + bindingAddress, e);
- }
+ private static InetSocketAddress getInetAddress(final String bindingAddress, final String portNumber) {
+ IpAddress ipAddress = IpAddressBuilder.getDefaultInstance(bindingAddress);
+ final InetAddress inetAd = IetfInetUtil.INSTANCE.inetAddressFor(ipAddress);
+ return new InetSocketAddress(inetAd, Integer.parseInt(portNumber));
}
public void close() {
import io.netty.channel.ChannelFuture;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import org.opendaylight.netconf.api.NetconfServerDispatcher;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.slf4j.Logger;
});
}
- private InetSocketAddress getInetAddress(final String bindingAddress, final String portNumber) {
- try {
- IpAddress ipAddress = IpAddressBuilder.getDefaultInstance(bindingAddress);
- final InetAddress inetAd = InetAddress.getByName(ipAddress.getIpv4Address() == null
- ? ipAddress.getIpv6Address().getValue() : ipAddress.getIpv4Address().getValue());
- return new InetSocketAddress(inetAd, Integer.valueOf(portNumber));
- } catch (final UnknownHostException e) {
- throw new IllegalArgumentException("Unable to bind netconf tcp endpoint to address " + bindingAddress, e);
- }
+ private static InetSocketAddress getInetAddress(final String bindingAddress, final String portNumber) {
+ IpAddress ipAddress = IpAddressBuilder.getDefaultInstance(bindingAddress);
+ final InetAddress inetAd = IetfInetUtil.INSTANCE.inetAddressFor(ipAddress);
+ return new InetSocketAddress(inetAd, Integer.parseInt(portNumber));
}
@Override
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
+import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.SettableFuture;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.junit.After;
private DataBroker dataBroker;
@Before
- public void setup() throws UnknownHostException {
+ public void setup() {
initMocks
(this);
remoteDeviceId = new RemoteDeviceId("netconf-topology",
- new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+ new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999));
final NetconfTopologySetup setup = mock(NetconfTopologySetup.class);
final Props props = NetconfNodeActor.props(setup, remoteDeviceId, DEFAULT_SCHEMA_REPOSITORY,
/* Test refresh master data */
final RemoteDeviceId remoteDeviceId2 = new RemoteDeviceId("netconf-topology2",
- new InetSocketAddress(InetAddress.getByName("127.0.0.2"), 9999));
+ new InetSocketAddress(InetAddresses.forString("127.0.0.2"), 9999));
final NetconfTopologySetup setup2 = mock(NetconfTopologySetup.class);
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;
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();
}
@Test
- public void testKeapAliveFacade() throws UnknownHostException {
+ public void testKeapAliveFacade() {
final ExecutorService executorService = mock(ExecutorService.class);
doReturn(executorService).when(processingExecutor).getExecutor();
.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));
}
@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);
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);
import akka.util.Timeout;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
+import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.concurrent.TimeUnit;
system = ActorSystem.create();
final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("netconf-topology",
- new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+ new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999));
final NetconfTopologySetup setup = mock(NetconfTopologySetup.class);
final Props props = NetconfNodeActor.props(setup, remoteDeviceId, DEFAULT_SCHEMA_REPOSITORY,
import akka.testkit.TestActorRef;
import akka.util.Timeout;
import com.google.common.collect.Lists;
+import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.concurrent.TimeUnit;
system = ActorSystem.create();
final RemoteDeviceId remoteDeviceId = new RemoteDeviceId("netconf-topology",
- new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 9999));
+ new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999));
final NetconfTopologySetup setup = mock(NetconfTopologySetup.class);
doReturn(Duration.apply(0, TimeUnit.SECONDS)).when(setup).getIdleTimeout();