import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
public class MonitoringToMdsalWriterTest {
@Test
public void testOnSessionStart() throws Exception {
Session session = new SessionBuilder()
- .setSessionId(1L)
+ .setSessionId(Uint32.ONE)
.build();
final InstanceIdentifier<Session> id =
InstanceIdentifier.create(NetconfState.class)
@Test
public void testOnSessionEnd() throws Exception {
Session session = new SessionBuilder()
- .setSessionId(1L)
+ .setSessionId(Uint32.ONE)
.build();
final InstanceIdentifier<Session> id =
InstanceIdentifier.create(NetconfState.class)
@Test
public void testOnSessionsUpdated() throws Exception {
Session session1 = new SessionBuilder()
- .setSessionId(1L)
+ .setSessionId(Uint32.ONE)
.build();
Session session2 = new SessionBuilder()
- .setSessionId(2L)
+ .setSessionId(Uint32.valueOf(2))
.build();
List<Session> sessions = new ArrayList<>();
sessions.add(session1);
@Test
public void testOnDataChangedSessionCreated() throws Exception {
- final Session session = createSession(1);
+ final Session session = createSession(Uint32.ONE);
final DataTreeModification<Session> treeChange = getTreeModification(session, ModificationType.WRITE);
publisher.onDataTreeChanged(Collections.singleton(treeChange));
ArgumentCaptor<NetconfSessionStart> captor = ArgumentCaptor.forClass(NetconfSessionStart.class);
public void testOnDataChangedSessionUpdated() throws Exception {
final DataTreeModification<Session> treeChange = mock(DataTreeModification.class);
final DataObjectModification<Session> changeObject = mock(DataObjectModification.class);
- final Session sessionBefore = createSessionWithInRpcCount(1, 0);
- final Session sessionAfter = createSessionWithInRpcCount(1, 1);
+ final Session sessionBefore = createSessionWithInRpcCount(Uint32.ONE, Uint32.ZERO);
+ final Session sessionAfter = createSessionWithInRpcCount(Uint32.ONE, Uint32.ONE);
doReturn(sessionBefore).when(changeObject).getDataBefore();
doReturn(sessionAfter).when(changeObject).getDataAfter();
doReturn(ModificationType.WRITE).when(changeObject).getModificationType();
@Test
public void testOnDataChangedSessionDeleted() throws Exception {
- final Session session = createSession(1);
+ final Session session = createSession(Uint32.ONE);
final DataTreeModification<Session> data = getTreeModification(session, ModificationType.DELETE);
publisher.onDataTreeChanged(Collections.singleton(data));
ArgumentCaptor<NetconfSessionEnd> captor = ArgumentCaptor.forClass(NetconfSessionEnd.class);
Assert.assertEquals(session.getUsername(), value.getUsername());
}
- private static Session createSession(final long id) {
- return createSessionWithInRpcCount(id, 0);
+ private static Session createSession(final Uint32 id) {
+ return createSessionWithInRpcCount(id, Uint32.ZERO);
}
- private static Session createSessionWithInRpcCount(final long id, final long inRpc) {
+ private static Session createSessionWithInRpcCount(final Uint32 id, final Uint32 inRpc) {
return new SessionBuilder()
.setSessionId(id)
.setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
.setUsername("user")
- .setInRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpc)))
+ .setInRpcs(new ZeroBasedCounter32(inRpc))
.build();
}
* 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.impl;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+
import com.google.common.net.InetAddresses;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@Override
protected void sessionUp() {
- Preconditions.checkState(loginTime == null, "Session is already up");
+ checkState(loginTime == null, "Session is already up");
this.loginTime = Instant.now().atZone(ZoneId.systemDefault());
super.sessionUp();
}
public Session toManagementSession() {
SessionBuilder builder = new SessionBuilder();
- builder.setSessionId(getSessionId());
+ builder.setSessionId(Uint32.valueOf(getSessionId()));
IpAddress address;
InetAddress address1 = InetAddresses.forString(header.getAddress());
if (address1 instanceof Inet4Address) {
}
builder.setSourceHost(new Host(address));
- Preconditions.checkState(DateAndTime.PATTERN_CONSTANTS.size() == 1);
+ checkState(DateAndTime.PATTERN_CONSTANTS.size() == 1);
String formattedDateTime = DATE_FORMATTER.format(loginTime);
Matcher matcher = DATE_TIME_PATTERN.matcher(formattedDateTime);
- Preconditions.checkState(matcher.matches(), "Formatted datetime %s does not match pattern %s",
+ checkState(matcher.matches(), "Formatted datetime %s does not match pattern %s",
formattedDateTime, DATE_TIME_PATTERN);
builder.setLoginTime(new DateAndTime(formattedDateTime));
- builder.setInBadRpcs(new ZeroBasedCounter32(inRpcFail));
- builder.setInRpcs(new ZeroBasedCounter32(inRpcSuccess));
- builder.setOutRpcErrors(new ZeroBasedCounter32(outRpcError));
+ builder.setInBadRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpcFail)));
+ builder.setInRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpcSuccess)));
+ builder.setOutRpcErrors(new ZeroBasedCounter32(Uint32.valueOf(outRpcError)));
builder.setUsername(header.getUserName());
builder.setTransport(getTransportForString(header.getTransport()));
import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
final NetconfNode netconfNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(1234)))
- .setActorResponseWaitTime(10)
+ .setActorResponseWaitTime(Uint16.valueOf(10))
.setTcpOnly(Boolean.TRUE)
.setSchemaless(Boolean.FALSE)
- .setKeepaliveDelay(0L)
- .setConnectionTimeoutMillis(5000L)
- .setDefaultRequestTimeoutMillis(5000L)
- .setMaxConnectionAttempts(1L)
+ .setKeepaliveDelay(Uint32.ZERO)
+ .setConnectionTimeoutMillis(Uint32.valueOf(5000))
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(5000))
+ .setMaxConnectionAttempts(Uint32.ONE)
.setCredentials(new LoginPwUnencryptedBuilder().setLoginPasswordUnencrypted(
new LoginPasswordUnencryptedBuilder().setUsername("user").setPassword("pass").build()).build())
.setSchemaCacheDirectory(cacheDir)
import org.opendaylight.yangtools.yang.common.Uint16;
public class NetconfTopologyManagerTest {
- private static final int ACTOR_RESPONSE_WAIT_TIME = 10;
+ private static final Uint16 ACTOR_RESPONSE_WAIT_TIME = Uint16.valueOf(10);
private static final String TOPOLOGY_ID = "topologyID";
private NetconfTopologyManager netconfTopologyManager;
protected NetconfTopologyContext newNetconfTopologyContext(final NetconfTopologySetup setup,
final ServiceGroupIdentifier serviceGroupIdent, final Timeout actorResponseWaitTime,
final DeviceActionFactory deviceActionFactory) {
- assertEquals(ACTOR_RESPONSE_WAIT_TIME, actorResponseWaitTime.duration().toSeconds());
+ assertEquals(ACTOR_RESPONSE_WAIT_TIME.toJava(), actorResponseWaitTime.duration().toSeconds());
return Objects.requireNonNull(mockContextMap.get(setup.getInstanceIdentifier()),
"No mock context for " + setup.getInstanceIdentifier()).apply(setup);
}
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
import scala.concurrent.duration.Duration;
public class RemoteDeviceConnectorImplTest {
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
.setSchemaless(false)
.setTcpOnly(false)
.setCredentials(credentials)
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
.setSchemaless(false)
.setTcpOnly(false)
.setCredentials(credentials)
- .setKeepaliveDelay(1L)
+ .setKeepaliveDelay(Uint32.ONE)
.build();
final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build();
final Host host = new Host(new IpAddress(new Ipv4Address("127.0.0.1")));
final PortNumber portNumber = new PortNumber(Uint16.valueOf(9999));
final NetconfNode testingNode = new NetconfNodeBuilder()
- .setConnectionTimeoutMillis(1000L)
- .setDefaultRequestTimeoutMillis(2000L)
+ .setConnectionTimeoutMillis(Uint32.valueOf(1000))
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(2000))
.setHost(host)
.setPort(portNumber)
.setCredentials(new LoginPasswordBuilder()
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository;
public class NetconfTopologyImplTest {
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(true)
.setCredentials(new LoginPasswordBuilder()
.setUsername("testuser").setPassword("testpassword").build())
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(true)
.setCredentials(new LoginPasswordBuilder()
.setUsername("testuser").setPassword("testpassword").build())
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(false)
.setCredentials(new LoginPasswordBuilder()
.setUsername("testuser").setPassword("testpassword").build())
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(false)
.setProtocol(new ProtocolBuilder().setName(Name.SSH).build())
.setCredentials(new LoginPasswordBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(false)
.setProtocol(new ProtocolBuilder().setName(Name.TLS).build())
.setCredentials(new LoginPasswordBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
- .setDefaultRequestTimeoutMillis(1000L)
- .setBetweenAttemptsTimeoutMillis(100)
- .setKeepaliveDelay(1000L)
+ .setDefaultRequestTimeoutMillis(Uint32.valueOf(1000))
+ .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100))
+ .setKeepaliveDelay(Uint32.valueOf(1000))
.setTcpOnly(false)
.setProtocol(new ProtocolBuilder().setName(Name.TLS).build())
.setCredentials(new LoginPasswordBuilder()
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfig;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.yanglib.impl.rev141210.YanglibConfigBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation;
}
final YanglibConfig yanglibConfig = new YanglibConfigBuilder().setBindingAddr("www.fake.com")
- .setBindingPort(300L).setCacheFolder(CACHE_DIR.getAbsolutePath()).build();
+ .setBindingPort(Uint32.valueOf(300)).setCacheFolder(CACHE_DIR.getAbsolutePath()).build();
yangLibProvider = new YangLibProvider(yanglibConfig, dataBroker, new SharedSchemaRepository("yang-library"));
}