X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fmessagebus-netconf%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fmessagebus%2Feventsources%2Fnetconf%2FNetconfTestUtils.java;h=d6fcceab0de474f9349f896a744aa584224ccb91;hb=39c6a21093eb30c3d30372c08b5df8ac0deadd24;hp=3e04fc3a85c650ec9c4047d9ea13c5967b2edc93;hpb=bc160d46add32a267c47b58df2061158616f6ba1;p=netconf.git diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java index 3e04fc3a85..d6fcceab0d 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java @@ -7,23 +7,24 @@ */ package org.opendaylight.netconf.messagebus.eventsources.netconf; -import com.google.common.base.Optional; +import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.Streams; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.StreamsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.Stream; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.netconf.streams.StreamBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.DomainName; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Host; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilities; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.AvailableCapabilitiesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapability; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.available.capabilities.AvailableCapabilityBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.network.topology.topology.topology.types.TopologyNetconf; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; @@ -35,84 +36,76 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. 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.QName; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; +@Deprecated(forRemoval = true) public final class NetconfTestUtils { - - public static final String notification_capability_prefix = "(urn:ietf:params:xml:ns:netconf:notification"; + public static final String NOTIFICATION_CAPABILITY_PREFIX = "(urn:ietf:params:xml:ns:netconf:notification"; private NetconfTestUtils() { - } - - public static Node getNetconfNode(String nodeIdent, String hostName, ConnectionStatus cs, - String notificationCapabilityPrefix) { - DomainName dn = new DomainName(hostName); - Host host = new Host(dn); - - List avCapList = new ArrayList<>(); - avCapList.add(notificationCapabilityPrefix + "_availableCapabilityString1"); - AvailableCapabilities avCaps = new AvailableCapabilitiesBuilder().setAvailableCapability(avCapList).build(); - NetconfNode nn = new NetconfNodeBuilder().setConnectionStatus(cs).setHost(host).setAvailableCapabilities(avCaps) - .build(); + } - NodeId nodeId = new NodeId(nodeIdent); - NodeKey nk = new NodeKey(nodeId); - NodeBuilder nb = new NodeBuilder(); - nb.setKey(nk); + public static Node getNetconfNode(final String nodeIdent, final String hostName, final ConnectionStatus cs, + final String notificationCapabilityPrefix) { + List avCapList = new ArrayList<>(); + avCapList.add(new AvailableCapabilityBuilder().setCapability(notificationCapabilityPrefix + + "_availableCapabilityString1").build()); - nb.addAugmentation(NetconfNode.class, nn); - return nb.build(); + return new NodeBuilder() + .withKey(new NodeKey(new NodeId(nodeIdent))) + .addAugmentation(new NetconfNodeBuilder() + .setConnectionStatus(cs) + .setHost(new Host(new DomainName(hostName))) + .setAvailableCapabilities(new AvailableCapabilitiesBuilder() + .setAvailableCapability(avCapList) + .build()) + .build()) + .build(); } - public static Node getNode(String nodeIdent) { - NodeId nodeId = new NodeId(nodeIdent); - NodeKey nk = new NodeKey(nodeId); - NodeBuilder nb = new NodeBuilder(); - nb.setKey(nk); - return nb.build(); + public static Node getNode(final String nodeIdent) { + return new NodeBuilder().withKey(new NodeKey(new NodeId(nodeIdent))).build(); } - public static InstanceIdentifier getInstanceIdentifier(Node node) { - TopologyKey NETCONF_TOPOLOGY_KEY = new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName())); - InstanceIdentifier nodeII = InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, NETCONF_TOPOLOGY_KEY).child(Node.class, node.getKey()); - return nodeII; + public static InstanceIdentifier getInstanceIdentifier(final Node node) { + return InstanceIdentifier.create(NetworkTopology.class) + .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName()))) + .child(Node.class, node.key()); } - public static Optional getAvailableStream(String Name, boolean replaySupport) { - Stream stream = new StreamBuilder().setName(new StreamNameType(Name)).setReplaySupport(replaySupport).build(); - List streamList = new ArrayList<>(); - streamList.add(stream); - Streams streams = new StreamsBuilder().setStream(streamList).build(); - return Optional.of(streams); + public static Optional getAvailableStream(final String name, final boolean replaySupport) { + Stream stream = new StreamBuilder().setName(new StreamNameType(name)).setReplaySupport(replaySupport).build(); + return Optional.of(new StreamsBuilder().setStream(ImmutableMap.of(stream.key(), stream)).build()); } - public static NormalizedNode getStreamsNode(String... streamName) { + public static NormalizedNode getStreamsNode(final String... streamName) { QName nameNode = QName.create(Stream.QNAME, "name"); Set streamSet = new HashSet<>(); for (String s : streamName) { MapEntryNode stream = Builders.mapEntryBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifierWithPredicates(Stream.QNAME, nameNode, s)) + .withNodeIdentifier(NodeIdentifierWithPredicates.of(Stream.QNAME, nameNode, s)) .withChild(Builders.leafBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(nameNode)) + .withNodeIdentifier(new NodeIdentifier(nameNode)) .withValue(s) .build()) .build(); streamSet.add(stream); } - CollectionNodeBuilder streams = Builders.mapBuilder().withNodeIdentifier(YangInstanceIdentifier.NodeIdentifier.create(Stream.QNAME)); + CollectionNodeBuilder streams = + Builders.mapBuilder().withNodeIdentifier(NodeIdentifier.create(Stream.QNAME)); for (MapEntryNode mapEntryNode : streamSet) { streams.withChild(mapEntryNode); } return Builders.containerBuilder() - .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(Streams.QNAME)) + .withNodeIdentifier(new NodeIdentifier(Streams.QNAME)) .withChild(streams.build()) .build(); }