X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-console%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fconsole%2Fimpl%2FNetconfCommandsImplTest.java;h=576408b371e6a8d95e9a876a365eb7f7b20a4c64;hb=f4b565fa5729237f88466358fb32bc558009a77a;hp=e15d3753389285c046c4978a9d69403c00295486;hpb=ade2c82ef6f71c1a6f5caf09d591734088893b1f;p=netconf.git diff --git a/netconf/netconf-console/src/test/java/org/opendaylight/netconf/console/impl/NetconfCommandsImplTest.java b/netconf/netconf-console/src/test/java/org/opendaylight/netconf/console/impl/NetconfCommandsImplTest.java index e15d375338..576408b371 100644 --- a/netconf/netconf-console/src/test/java/org/opendaylight/netconf/console/impl/NetconfCommandsImplTest.java +++ b/netconf/netconf-console/src/test/java/org/opendaylight/netconf/console/impl/NetconfCommandsImplTest.java @@ -15,30 +15,32 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import com.google.common.collect.ImmutableList; -import java.io.InputStream; +import com.google.common.util.concurrent.MoreExecutors; import java.util.ArrayList; -import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javassist.ClassPool; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.cluster.databroker.ConcurrentDOMDataBroker; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter; import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; +import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.controller.sal.core.spi.data.DOMStore; +import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator; +import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator; +import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; @@ -65,11 +67,7 @@ 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.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.binding.data.codec.gen.impl.DataObjectSerializerGenerator; -import org.opendaylight.yangtools.binding.data.codec.gen.impl.StreamWriterGenerator; -import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; @@ -90,7 +88,9 @@ public class NetconfCommandsImplTest { @Before public void setUp() throws Exception { - schemaContext = YangParserTestUtils.parseYangStreams(getYangSchemas()); + schemaContext = YangParserTestUtils.parseYangResources(NetconfCommandsImplTest.class, + "/schemas/network-topology@2013-10-21.yang", "/schemas/ietf-inet-types@2013-07-15.yang", + "/schemas/yang-ext.yang", "/schemas/netconf-node-topology.yang"); schemaContext.getModules(); final SchemaService schemaService = createSchemaService(); @@ -101,11 +101,8 @@ public class NetconfCommandsImplTest { datastores.put(LogicalDatastoreType.CONFIGURATION, configStore); datastores.put(LogicalDatastoreType.OPERATIONAL, operStore); - final ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool( - 16, 16, "CommitFutures"); - - final ConcurrentDOMDataBroker cDOMDataBroker = - new ConcurrentDOMDataBroker(datastores, listenableFutureExecutor); + final DOMDataBroker domDataBroker = + new SerializedDOMDataBroker(datastores, MoreExecutors.newDirectExecutorService()); final ClassPool pool = ClassPool.getDefault(); final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(pool)); @@ -118,7 +115,7 @@ public class NetconfCommandsImplTest { final BindingToNormalizedNodeCodec bindingToNormalized = new BindingToNormalizedNodeCodec(loading, codecRegistry); bindingToNormalized.onGlobalContextUpdated(schemaContext); - dataBroker = new BindingDOMDataBrokerAdapter(cDOMDataBroker, bindingToNormalized); + dataBroker = new BindingDOMDataBrokerAdapter(domDataBroker, bindingToNormalized); netconfCommands = new NetconfCommandsImpl(dataBroker); } @@ -127,11 +124,11 @@ public class NetconfCommandsImplTest { public void testListDevice() throws TimeoutException, TransactionCommitFailedException { createTopology(LogicalDatastoreType.OPERATIONAL); - final Map map = netconfCommands.listDevices(); + final Map map = netconfCommands.listDevices(); map.containsKey(NetconfConsoleConstants.NETCONF_ID); assertTrue(map.containsKey(NODE_ID)); - final Map mapNode = (Map) map.get(NODE_ID); + final Map mapNode = (Map) map.get(NODE_ID); assertBaseNodeAttributes(mapNode); } @@ -139,19 +136,19 @@ public class NetconfCommandsImplTest { public void testShowDevice() throws TimeoutException, TransactionCommitFailedException { createTopology(LogicalDatastoreType.OPERATIONAL); - final Map mapCorrect = netconfCommands.showDevice(IP, String.valueOf(PORT)); + final Map mapCorrect = netconfCommands.showDevice(IP, String.valueOf(PORT)); mapCorrect.containsKey(NetconfConsoleConstants.NETCONF_ID); assertTrue(mapCorrect.containsKey(NODE_ID)); - assertBaseNodeAttributesImmutableList((Map) mapCorrect.get(NODE_ID)); + assertBaseNodeAttributesImmutableList((Map) mapCorrect.get(NODE_ID)); - final Map mapWrongPort = netconfCommands.showDevice(IP, "1"); + final Map mapWrongPort = netconfCommands.showDevice(IP, "1"); assertFalse(mapWrongPort.containsKey(NODE_ID)); - final Map mapWrongIP = netconfCommands.showDevice("1.1.1.1", String.valueOf(PORT)); + final Map mapWrongIP = netconfCommands.showDevice("1.1.1.1", String.valueOf(PORT)); assertFalse(mapWrongIP.containsKey(NODE_ID)); - final Map mapId = netconfCommands.showDevice(NODE_ID); + final Map mapId = netconfCommands.showDevice(NODE_ID); assertTrue(mapId.containsKey(NODE_ID)); assertBaseNodeAttributesImmutableList((Map) mapId.get(NODE_ID)); } @@ -230,7 +227,7 @@ public class NetconfCommandsImplTest { assertEquals(1, nodes.size()); } - private void createTopology(LogicalDatastoreType dataStoreType) + private void createTopology(final LogicalDatastoreType dataStoreType) throws TransactionCommitFailedException, TimeoutException { final List nodes = new ArrayList<>(); final Node node = getNetconfNode(NODE_ID, IP, PORT, CONN_STATUS, CAP_PREFIX); @@ -245,8 +242,8 @@ public class NetconfCommandsImplTest { writeTransaction.submit().checkedGet(2, TimeUnit.SECONDS); } - private Node getNetconfNode(String nodeIdent, String ip, int portNumber, - NetconfNodeConnectionStatus.ConnectionStatus cs, String notificationCapabilityPrefix) { + private static Node getNetconfNode(final String nodeIdent, final String ip, final int portNumber, + final NetconfNodeConnectionStatus.ConnectionStatus cs, final String notificationCapabilityPrefix) { final Host host = HostBuilder.getDefaultInstance(ip); final PortNumber port = new PortNumber(portNumber); @@ -269,8 +266,7 @@ public class NetconfCommandsImplTest { return nb.build(); } - private void assertBaseNodeAttributes(Map mapNode) { - + private static void assertBaseNodeAttributes(final Map mapNode) { assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_ID)); assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_IP)); assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_PORT)); @@ -282,7 +278,7 @@ public class NetconfCommandsImplTest { assertEquals(CONN_STATUS.name().toLowerCase(), mapNode.get(NetconfConsoleConstants.STATUS)); } - private void assertBaseNodeAttributesImmutableList(Map mapNode) { + private static void assertBaseNodeAttributesImmutableList(final Map mapNode) { assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_ID)); assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_IP)); assertTrue(mapNode.containsKey(NetconfConsoleConstants.NETCONF_PORT)); @@ -294,28 +290,15 @@ public class NetconfCommandsImplTest { assertEquals(ImmutableList.of(CONN_STATUS.name()), mapNode.get(NetconfConsoleConstants.STATUS)); } - private List getYangSchemas() { - final List schemaPaths = Arrays.asList("/schemas/network-topology@2013-10-21.yang", - "/schemas/ietf-inet-types@2013-07-15.yang", "/schemas/yang-ext.yang", - "/schemas/netconf-node-topology.yang"); - - final List schemas = new ArrayList<>(); - for (String schemaPath : schemaPaths) { - final InputStream resourceAsStream = getClass().getResourceAsStream(schemaPath); - schemas.add(resourceAsStream); - } - return schemas; - } - private SchemaService createSchemaService() { return new SchemaService() { @Override - public void addModule(Module module) { + public void addModule(final Module module) { } @Override - public void removeModule(Module module) { + public void removeModule(final Module module) { }