This bumps mdsal to 5.0.2 as part of Magnesium MRI.
Change-Id: Id9ab45edf28477dca8acf8f7538cfd26f237f6f4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
<feature name="odl-netconf-connector" version="${project.version}">
- <feature version="[2,3)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
+ <feature version="[3,4)">odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</feature>
</feature>
</features>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<feature name="odl-netconf-api" version="${project.version}">
<feature version="[6,7)">odl-netty-4</feature>
<feature version="[4,5)">odl-yangtools-parser-api</feature>
- <feature version="[2,3)">odl-mdsal-model-rfc7895</feature>
- <feature version="[2,3)">odl-mdsal-model-rfc8342</feature>
+ <feature version="[3,4)">odl-mdsal-model-rfc7895</feature>
+ <feature version="[3,4)">odl-mdsal-model-rfc8342</feature>
</feature>
</features>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<feature name="odl-restconf-common" version="${project.version}">
<feature version="[6,7)">odl-karaf-feat-jetty</feature>
<feature version="[4,5)">odl-yangtools-export</feature>
- <feature version="[2,3)">odl-mdsal-model-rfc7895</feature>
+ <feature version="[3,4)">odl-mdsal-model-rfc7895</feature>
</feature>
</features>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
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.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yangtools.yang.common.Uint16;
class ContextKey {
private final IpAddress address;
checkArgument(ipAddress instanceof Inet6Address);
yangIp = new IpAddress(IetfInetUtil.INSTANCE.ipv6AddressFor(ipAddress));
}
- return new ContextKey(yangIp, new PortNumber(inetSocketAddr.getPort()));
+ return new ContextKey(yangIp, new PortNumber(Uint16.valueOf(inetSocketAddr.getPort())));
}
@Override
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
+import org.opendaylight.yangtools.yang.common.Uint16;
public class ContextKeyTest {
private IpAddress address1;
address1 = IpAddressBuilder.getDefaultInstance("1.2.3.4");
address2 = IpAddressBuilder.getDefaultInstance("5.6.7.8");
- port1 = new PortNumber(123);
- port2 = new PortNumber(456);
+ port1 = new PortNumber(Uint16.valueOf(123));
+ port2 = new PortNumber(Uint16.valueOf(456));
mockNode = mock(NetconfNode.class);
mockSession = mock(NetconfClientSession.class);
moduleInfoBackedContext.addModuleInfos(Collections.singletonList($YangModuleInfoImpl.getInstance()));
moduleInfoBackedContext.addModuleInfos(Collections.singletonList(org.opendaylight.yang.gen.v1.urn.ietf.params
.xml.ns.yang.ietf.netconf.notifications.rev120206.$YangModuleInfoImpl.getInstance()));
- final Optional<SchemaContext> schemaContextOptional = moduleInfoBackedContext.tryToCreateSchemaContext();
+ final Optional<? extends SchemaContext> schemaContextOptional =
+ moduleInfoBackedContext.tryToCreateSchemaContext();
checkState(schemaContextOptional.isPresent());
NOTIFICATIONS_SCHEMA_CTX = schemaContextOptional.get();
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfSessionStart;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.ZeroBasedCounter32;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
.setSessionId(id)
.setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
.setUsername("user")
- .setInRpcs(new ZeroBasedCounter32(inRpc))
+ .setInRpcs(new ZeroBasedCounter32(Uint32.valueOf(inRpc)))
.build();
}
* This program and the accompanying materials are made available under the
* 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.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.nmda.rev190107;
+ */
+package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.nmda.rev190107;
import java.util.Optional;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.nmda.rev190107.GetDataInput.MaxDepth;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.nmda.rev190107.GetDataInput.MaxDepth.Enumeration;
+import org.opendaylight.yangtools.yang.common.Uint16;
/**
* MaxDepth utilities.
return new MaxDepth(optEnum.get());
}
// FIXME: consider being stricter about number formats here
- return new MaxDepth(Integer.valueOf(defaultValue));
+ return new MaxDepth(Uint16.valueOf(defaultValue));
}
}
* 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.console.commands;
import static java.util.Objects.requireNonNull;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.parameters.protocol.specification.tls._case.TlsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.Credentials;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
@Service
@Command(name = "connect-device", scope = "netconf", description = "Connect to a netconf device.")
final NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
netconfNodeBuilder.setHost(new Host(new IpAddress(new Ipv4Address(deviceIp))))
- .setPort(new PortNumber(Integer.decode(devicePort)))
+ .setPort(new PortNumber(Uint16.valueOf(Integer.decode(devicePort))))
.setTcpOnly(isTcpOnly)
.setSchemaless(isSchemaless);
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
new LoginPasswordBuilder().setPassword(newPassword).setUsername(newUsername).build();
final NetconfNode updatedNetconfNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address(deviceIp))))
- .setPort(new PortNumber(Integer.decode(devicePort)))
+ .setPort(new PortNumber(Uint16.valueOf(Integer.decode(devicePort))))
.setTcpOnly(tcpOnly)
.setSchemaless(isSchemaless)
.setCredentials(credentials)
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.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
@Test
public void testConnectDisconnectDevice() throws InterruptedException, TimeoutException, ExecutionException {
final NetconfNode netconfNode = new NetconfNodeBuilder()
- .setPort(new PortNumber(7777)).setHost(HostBuilder.getDefaultInstance("10.10.1.1")).build();
+ .setPort(new PortNumber(Uint16.valueOf(7777))).setHost(HostBuilder.getDefaultInstance("10.10.1.1"))
+ .build();
createTopology(LogicalDatastoreType.CONFIGURATION);
netconfCommands.connectDevice(netconfNode, "netconf-ID");
final NetconfNodeConnectionStatus.ConnectionStatus cs, final String notificationCapabilityPrefix) {
final Host host = HostBuilder.getDefaultInstance(ip);
- final PortNumber port = new PortNumber(portNumber);
+ final PortNumber port = new PortNumber(Uint16.valueOf(portNumber));
final List<AvailableCapability> avCapList = new ArrayList<>();
avCapList.add(new AvailableCapabilityBuilder()
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionKey;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.ZeroBasedCounter32;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
builder.setOutNotifications(new ZeroBasedCounter32(outNotification));
- builder.withKey(new SessionKey(getSessionId()));
+ builder.withKey(new SessionKey(Uint32.valueOf(getSessionId())));
Session1Builder builder1 = new Session1Builder();
builder1.setSessionIdentifier(header.getSessionIdentifier());
final Session managementSession = this.session.toManagementSession();
this.session.onIncommingRpcSuccess();
final Session afterRpcSuccess = this.session.toManagementSession();
- Assert.assertEquals(managementSession.getInRpcs().getValue() + 1,
+ Assert.assertEquals(managementSession.getInRpcs().getValue().toJava() + 1,
afterRpcSuccess.getInRpcs().getValue().longValue());
}
final Session managementSession = this.session.toManagementSession();
this.session.onIncommingRpcFail();
final Session afterRpcSuccess = this.session.toManagementSession();
- Assert.assertEquals(managementSession.getInBadRpcs().getValue() + 1,
+ Assert.assertEquals(managementSession.getInBadRpcs().getValue().toJava() + 1,
afterRpcSuccess.getInBadRpcs().getValue().longValue());
}
final Session managementSession = this.session.toManagementSession();
this.session.onOutgoingRpcError();
final Session afterRpcSuccess = this.session.toManagementSession();
- Assert.assertEquals(managementSession.getOutRpcErrors().getValue() + 1,
+ Assert.assertEquals(managementSession.getOutRpcErrors().getValue().toJava() + 1,
afterRpcSuccess.getOutRpcErrors().getValue().longValue());
}
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfCapabilityChange;
import org.opendaylight.yangtools.yang.common.Revision;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.model.api.Module;
public class NetconfCapabilityMonitoringServiceTest {
private YangModuleCapability moduleCapability1;
private YangModuleCapability moduleCapability2;
private static final Session SESSION = new SessionBuilder()
- .setSessionId(1L)
+ .setSessionId(Uint32.valueOf(1))
.setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
.setUsername("admin")
.build();
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.HostBuilder;
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.common.Uint32;
public class NetconfSessionMonitoringServiceTest {
private static final Session SESSION_1 = new SessionBuilder()
- .setSessionId(1L)
+ .setSessionId(Uint32.valueOf(1))
.setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
.setUsername("admin")
.build();
private static final Session SESSION_2 = new SessionBuilder()
- .setSessionId(2L)
+ .setSessionId(Uint32.valueOf(2))
.setSourceHost(HostBuilder.getDefaultInstance("0.0.0.0"))
.setUsername("admin")
.build();
this.eventExecutor = requireNonNull(eventExecutor);
this.clientDispatcher = requireNonNull(clientDispatcher);
this.topologyId = requireNonNull(topologyId);
- this.writeTxIdleTimeout = Duration.apply(config.getWriteTransactionIdleTimeout(), TimeUnit.SECONDS);
+ this.writeTxIdleTimeout = Duration.apply(config.getWriteTransactionIdleTimeout().toJava(), TimeUnit.SECONDS);
this.mountPointService = mountPointService;
this.encryptionService = requireNonNull(encryptionService);
this.deviceActionFactory = requireNonNull(deviceActionFactory);
requireNonNull(netconfNode.getHost());
requireNonNull(netconfNode.getHost().getIpAddress());
- final Timeout actorResponseWaitTime = new Timeout(Duration.create(netconfNode.getActorResponseWaitTime(),
- "seconds"));
+ final Timeout actorResponseWaitTime = new Timeout(
+ Duration.create(netconfNode.getActorResponseWaitTime().toJava(), "seconds"));
final ServiceGroupIdentifier serviceGroupIdent =
ServiceGroupIdentifier.create(instanceIdentifier.toString());
final RemoteDeviceHandler<NetconfSessionPreferences> deviceHandler) {
//setup default values since default value is not supported in mdsal
final long defaultRequestTimeoutMillis = node.getDefaultRequestTimeoutMillis() == null
- ? NetconfTopologyUtils.DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis();
+ ? NetconfTopologyUtils.DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis().toJava();
final long keepaliveDelay = node.getKeepaliveDelay() == null
- ? NetconfTopologyUtils.DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay();
+ ? NetconfTopologyUtils.DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay().toJava();
final boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null
? NetconfTopologyUtils.DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema();
final Optional<NetconfSessionPreferences> userCapabilities = getUserCapabilities(node);
final int rpcMessageLimit =
node.getConcurrentRpcLimit() == null
- ? NetconfTopologyUtils.DEFAULT_CONCURRENT_RPC_LIMIT : node.getConcurrentRpcLimit();
+ ? NetconfTopologyUtils.DEFAULT_CONCURRENT_RPC_LIMIT : node.getConcurrentRpcLimit().toJava();
if (rpcMessageLimit < 1) {
LOG.info("{}: Concurrent rpc limit is smaller than 1, no limit will be enforced.", remoteDeviceId);
//setup default values since default value is not supported in mdsal
final long clientConnectionTimeoutMillis = node.getConnectionTimeoutMillis() == null
- ? NetconfTopologyUtils.DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis();
+ ? NetconfTopologyUtils.DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis().toJava();
final long maxConnectionAttempts = node.getMaxConnectionAttempts() == null
- ? NetconfTopologyUtils.DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts();
+ ? NetconfTopologyUtils.DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts().toJava();
final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null
- ? NetconfTopologyUtils.DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis();
+ ? NetconfTopologyUtils.DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS
+ : node.getBetweenAttemptsTimeoutMillis().toJava();
final boolean isTcpOnly = node.isTcpOnly() == null
? NetconfTopologyUtils.DEFAULT_IS_TCP_ONLY : node.isTcpOnly();
final BigDecimal sleepFactor = node.getSleepFactor() == null
? NetconfTopologyUtils.DEFAULT_SLEEP_FACTOR : node.getSleepFactor();
- final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue());
+ final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue().toJava());
final ReconnectStrategyFactory sf =
new TimedReconnectStrategyFactory(netconfTopologyDeviceSetup.getEventExecutor(), maxConnectionAttempts,
final IpAddress ipAddress = node.getHost().getIpAddress();
final InetSocketAddress address = new InetSocketAddress(ipAddress.getIpv4Address() != null
? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(),
- node.getPort().getValue());
+ node.getPort().getValue().toJava());
return new RemoteDeviceId(nodeId.getValue(), address);
}
import org.opendaylight.yangtools.yang.common.RpcError;
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.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
throws InterruptedException, ExecutionException, TimeoutException {
final NetconfNode netconfNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(1234))
+ .setPort(new PortNumber(Uint16.valueOf(1234)))
.setActorResponseWaitTime(10)
.setTcpOnly(Boolean.TRUE)
.setSchemaless(Boolean.FALSE)
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
private NetconfNode newNetconfNode() {
return new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setConnectionStatus(NetconfNodeConnectionStatus.ConnectionStatus.Connected)
.setClusteredConnectionStatus(new ClusteredConnectionStatusBuilder()
.setNetconfMasterNode(masterAddress).build())
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
+import org.opendaylight.yangtools.yang.common.Uint16;
public class NetconfTopologyManagerTest {
private static final int ACTOR_RESPONSE_WAIT_TIME = 10;
final NetconfNode netconfNode1 = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(1111))
+ .setPort(new PortNumber(Uint16.valueOf(1111)))
.setActorResponseWaitTime(ACTOR_RESPONSE_WAIT_TIME)
.build();
final Node node1 = new NodeBuilder().setNodeId(nodeId1).addAugmentation(NetconfNode.class,
final NetconfNode netconfNode2 = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(2222))
+ .setPort(new PortNumber(Uint16.valueOf(2222)))
.setActorResponseWaitTime(ACTOR_RESPONSE_WAIT_TIME)
.build();
final Node node2 = new NodeBuilder().setNodeId(nodeId2).addAugmentation(NetconfNode.class,
mockContextMap.clear();
final NetconfNode updatedNetconfNode1 = new NetconfNodeBuilder(netconfNode1)
- .setPort(new PortNumber(33333)).build();
+ .setPort(new PortNumber(Uint16.valueOf(33333))).build();
final Node updatedNode1 = new NodeBuilder().setNodeId(nodeId1).addAugmentation(NetconfNode.class,
updatedNetconfNode1).build();
final NetconfNode netconfNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(10))
+ .setPort(new PortNumber(Uint16.valueOf(10)))
.setActorResponseWaitTime(ACTOR_RESPONSE_WAIT_TIME).build();
final Node node = new NodeBuilder().setNodeId(nodeId).addAugmentation(NetconfNode.class,
netconfNode).build();
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
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 scala.concurrent.duration.Duration;
public class RemoteDeviceConnectorImplTest {
.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))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
.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))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
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);
+ final PortNumber portNumber = new PortNumber(Uint16.valueOf(9999));
final NetconfNode testingNode = new NetconfNodeBuilder()
.setConnectionTimeoutMillis(1000L)
.setDefaultRequestTimeoutMillis(2000L)
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.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
public class NetconfTopologyUtilTest {
@Test
public void testCreateRemoteDeviceId() {
final Host host = new Host(new IpAddress(new Ipv4Address("127.0.0.1")));
- final NetconfNode netconfNode = new NetconfNodeBuilder().setHost(host).setPort(new PortNumber(9999)).build();
+ final NetconfNode netconfNode = new NetconfNodeBuilder().setHost(host)
+ .setPort(new PortNumber(Uint16.valueOf(9999))).build();
final NodeId nodeId = new NodeId("testing-node");
final RemoteDeviceId id = NetconfTopologyUtils.createRemoteDeviceId(nodeId, netconfNode);
final NetconfNodeAugmentedOptional nodeOptional) {
//setup default values since default value is not supported in mdsal
final long defaultRequestTimeoutMillis = node.getDefaultRequestTimeoutMillis() == null
- ? DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis();
+ ? DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis().toJava();
final long keepaliveDelay = node.getKeepaliveDelay() == null
- ? DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay();
+ ? DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay().toJava();
final boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null
? DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema();
final IpAddress ipAddress = node.getHost().getIpAddress();
final InetSocketAddress address = new InetSocketAddress(ipAddress.getIpv4Address() != null
? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(),
- node.getPort().getValue());
+ node.getPort().getValue().toJava());
final RemoteDeviceId remoteDeviceId = new RemoteDeviceId(nodeId.getValue(), address);
RemoteDeviceHandler<NetconfSessionPreferences> salFacade =
}
final Optional<UserPreferences> userCapabilities = getUserCapabilities(node);
- final int rpcMessageLimit =
- node.getConcurrentRpcLimit() == null ? DEFAULT_CONCURRENT_RPC_LIMIT : node.getConcurrentRpcLimit();
+ final int rpcMessageLimit = node.getConcurrentRpcLimit() == null ? DEFAULT_CONCURRENT_RPC_LIMIT
+ : node.getConcurrentRpcLimit().toJava();
if (rpcMessageLimit < 1) {
LOG.info("Concurrent rpc limit is smaller than 1, no limit will be enforced for device {}", remoteDeviceId);
//setup default values since default value is not supported in mdsal
final long clientConnectionTimeoutMillis = node.getConnectionTimeoutMillis() == null
- ? DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis();
+ ? DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis().toJava();
final long maxConnectionAttempts = node.getMaxConnectionAttempts() == null
- ? DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts();
+ ? DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts().toJava();
final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null
- ? DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis();
+ ? DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis().toJava();
final boolean useTcp = node.isTcpOnly() == null ? DEFAULT_IS_TCP_ONLY : node.isTcpOnly();
final BigDecimal sleepFactor = node.getSleepFactor() == null ? DEFAULT_SLEEP_FACTOR : node.getSleepFactor();
- final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue());
+ final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue().toJava());
final ReconnectStrategyFactory sf = new TimedReconnectStrategyFactory(eventExecutor,
maxConnectionAttempts, betweenAttemptsTimeoutMillis, sleepFactor);
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
.build())
.build();
final Host host = HostBuilder.getDefaultInstance(address);
- final PortNumber portNumber = new PortNumber(port);
+ final PortNumber portNumber = new PortNumber(Uint16.valueOf(port));
final NetconfNode netconfNode = new NetconfNodeBuilder()
.setHost(host)
.setPort(portNumber)
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
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.parser.repo.SharedSchemaRepository;
public class NetconfTopologyImplTest {
final NetconfNode testingNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
final NetconfNode testingNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
final NetconfNode testingNode2 = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
final NetconfNode testingNode3 = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
final NetconfNode testingNode4 = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
final String password = "pa$$word";
final NetconfNode netconfNode = new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
- .setPort(new PortNumber(9999))
+ .setPort(new PortNumber(Uint16.valueOf(9999)))
.setReconnectOnChangedSchema(true)
.setDefaultRequestTimeoutMillis(1000L)
.setBetweenAttemptsTimeoutMillis(100)
LOG.info("{} : Try to remount device.", id);
onRemoteSessionDown();
salFacade.onDeviceReconnected(remoteSessionCapabilities, node);
- }, nodeOptional.getIgnoreMissingSchemaSources().getReconnectTime(), TimeUnit.MILLISECONDS);
+ }, nodeOptional.getIgnoreMissingSchemaSources().getReconnectTime().toJava(),
+ TimeUnit.MILLISECONDS);
return;
}
}
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
netconfNodeBuilder.setConnectionStatus(ConnectionStatus.Connecting);
netconfNodeBuilder.setHost(id.getHost());
- netconfNodeBuilder.setPort(new PortNumber(id.getAddress().getPort()));
+ netconfNodeBuilder.setPort(new PortNumber(Uint16.valueOf(id.getAddress().getPort())));
nodeBuilder.addAugmentation(NetconfNode.class, netconfNodeBuilder.build());
Node node = nodeBuilder.build();
final NetconfNode data = new NetconfNodeBuilder()
.setHost(id.getHost())
- .setPort(new PortNumber(id.getAddress().getPort()))
+ .setPort(new PortNumber(Uint16.valueOf(id.getAddress().getPort())))
.setConnectionStatus(ConnectionStatus.UnableToConnect).setConnectedMessage(reason).build();
final WriteTransaction writeTx = txChain.newWriteOnlyTransaction();
return new NetconfNodeBuilder()
.setHost(id.getHost())
- .setPort(new PortNumber(id.getAddress().getPort()))
+ .setPort(new PortNumber(Uint16.valueOf(id.getAddress().getPort())))
.setConnectionStatus(connectionStatus)
.setAvailableCapabilities(avCapabalitiesBuilder.build())
.setUnavailableCapabilities(unavailableCapabilities(capabilities.getUnresolvedCapabilites()))
final NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder()
.setHost(id.getHost())
- .setPort(new PortNumber(id.getAddress().getPort()))
+ .setPort(new PortNumber(Uint16.valueOf(id.getAddress().getPort())))
.setConnectionStatus(up ? ConnectionStatus.Connected : ConnectionStatus.Connecting)
.setAvailableCapabilities(avCapabalitiesBuilder.build())
.setUnavailableCapabilities(unavailableCapabilities(capabilities.getUnresolvedCapabilites()))
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.login.pw.LoginPasswordBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.login.pw.unencrypted.LoginPasswordUnencryptedBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.yang.common.Uint16;
public class NetconfTopologyRPCProviderTest {
private static final NodeId NODE_ID = new NodeId("testing-node");
builder.setCredentials(credentials);
builder.setHost(new Host(new IpAddress(new Ipv4Address("10.18.16.188"))));
- builder.setPort(new PortNumber(830));
+ builder.setPort(new PortNumber(Uint16.valueOf(830)));
builder.setTcpOnly(Boolean.FALSE);
builder.setNodeId(NODE_ID.toString());
return builder.build();
@XmlElement(name = "session-id")
public long getId() {
- return managementSession.getSessionId();
+ return managementSession.getSessionId().longValue();
}
@XmlElement(name = "source-host")
@XmlElement(name = "in-bad-rpcs")
public Long getInBadRpcs() {
- return managementSession.getInBadRpcs().getValue();
+ return managementSession.getInBadRpcs().getValue().longValue();
}
@XmlElement(name = "in-rpcs")
public Long getInRpcs() {
- return managementSession.getInRpcs().getValue();
+ return managementSession.getInRpcs().getValue().longValue();
}
@XmlElement(name = "out-notifications")
public Long getOutNotifications() {
- return managementSession.getOutNotifications().getValue();
+ return managementSession.getOutNotifications().getValue().longValue();
}
@XmlElement(name = "out-rpc-errors")
public Long getOutRpcErrors() {
- return managementSession.getOutRpcErrors().getValue();
+ return managementSession.getOutRpcErrors().getValue().longValue();
}
@XmlElement(name = "transport")
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>4.0.6</version>
+ <version>5.0.2</version>
<relativePath/>
</parent>
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.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yangtools.yang.common.Uint16;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Inject
// The point of all the arguments here is simply to make your chosen Dependency Injection (DI) framework init. them
- public Bierman02RestConfWiring(RestConfConfig config,
- DOMSchemaService domSchemaService, DOMMountPointService domMountPointService, DOMRpcService domRpcService,
- DOMDataBroker domDataBroker, DOMNotificationService domNotificationService,
- ControllerContext controllerContext, RestconfApplication application,
- BrokerFacade broker, RestconfImpl restconf, StatisticsRestconfServiceWrapper stats,
- JSONRestconfServiceImpl jsonRestconfServiceImpl,
- WebInitializer webInitializer) {
+ public Bierman02RestConfWiring(final RestConfConfig config,
+ final DOMSchemaService domSchemaService, final DOMMountPointService domMountPointService,
+ final DOMRpcService domRpcService, final DOMDataBroker domDataBroker,
+ final DOMNotificationService domNotificationService, final ControllerContext controllerContext,
+ final RestconfApplication application, final BrokerFacade broker, final RestconfImpl restconf,
+ final StatisticsRestconfServiceWrapper stats, final JSONRestconfServiceImpl jsonRestconfServiceImpl,
+ final WebInitializer webInitializer) {
// WebSocket
LOG.info("webSocketAddress = {}, webSocketPort = {}", config.webSocketAddress(), config.webSocketPort());
IpAddress wsIpAddress = IpAddressBuilder.getDefaultInstance(config.webSocketAddress().getHostAddress());
- this.webSocketServer = new RestconfProviderImpl(stats, wsIpAddress, new PortNumber(config.webSocketPort()));
+ this.webSocketServer = new RestconfProviderImpl(stats, wsIpAddress,
+ new PortNumber(Uint16.valueOf(config.webSocketPort())));
}
@PostConstruct
public void start() {
this.webSocketServerThread = new Thread(WebSocketServer.createInstance(
- websocketAddress.stringValue(), websocketPort.getValue()));
+ websocketAddress.stringValue(), websocketPort.getValue().toJava()));
this.webSocketServerThread.setName("Web socket server on port " + websocketPort);
this.webSocketServerThread.start();