X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-testtool%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Ftest%2Ftool%2FNetconfDeviceSimulator.java;fp=opendaylight%2Fnetconf%2Fnetconf-testtool%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Ftest%2Ftool%2FNetconfDeviceSimulator.java;h=4956c605fcfb8ba6e6429e0c4646f0bc939b955b;hp=600baa743169744a9e2019ef116ee98f4a194c4e;hb=6e769a8703df98ec8e043862d1019cb399b5cf66;hpb=81b75027c62a3e380b688b82a56951ef4fccdd7c diff --git a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/NetconfDeviceSimulator.java b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/NetconfDeviceSimulator.java index 600baa7431..4956c605fc 100644 --- a/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/NetconfDeviceSimulator.java +++ b/opendaylight/netconf/netconf-testtool/src/main/java/org/opendaylight/controller/netconf/test/tool/NetconfDeviceSimulator.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.netconf.test.tool; import com.google.common.base.Charsets; import com.google.common.base.Function; +import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; @@ -17,6 +18,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.CharStreams; import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.Futures; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.local.LocalAddress; @@ -25,6 +27,7 @@ import io.netty.util.HashedWheelTimer; import java.io.Closeable; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.lang.management.ManagementFactory; import java.net.Inet4Address; @@ -64,6 +67,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceListener; +import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; import org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache; import org.opendaylight.yangtools.yang.parser.builder.impl.BuilderUtils; import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder; @@ -78,8 +82,6 @@ public class NetconfDeviceSimulator implements Closeable { private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceSimulator.class); - public static final int CONNECTION_TIMEOUT_MILLIS = 20000; - private final NioEventLoopGroup nettyThreadgroup; private final HashedWheelTimer hashedWheelTimer; private final List devicesChannels = Lists.newArrayList(); @@ -123,34 +125,36 @@ public class NetconfDeviceSimulator implements Closeable { } private Map toModuleBuilders(final Map> sources) { - final Map asts = Maps.transformValues(sources, new Function, ParserRuleContext>() { - @Override - public ParserRuleContext apply(final Map.Entry input) { - return input.getKey().getAST(); - } - }); - final Map> namespaceContext = BuilderUtils.createYangNamespaceContext( - asts.values(), Optional.absent()); + final Map asts = Maps.transformValues(sources, new Function, ParserRuleContext>() { + @Override + public ParserRuleContext apply(final Map.Entry input) { + return input.getKey().getAST(); + } + }); + final Map> namespaceContext = BuilderUtils.createYangNamespaceContext( + asts.values(), Optional.absent()); - final ParseTreeWalker walker = new ParseTreeWalker(); - final Map sourceToBuilder = new HashMap<>(); + final ParseTreeWalker walker = new ParseTreeWalker(); + final Map sourceToBuilder = new HashMap<>(); - for (final Map.Entry entry : asts.entrySet()) { - final ModuleBuilder moduleBuilder = YangParserListenerImpl.create(namespaceContext, entry.getKey().getName(), - walker, entry.getValue()).getModuleBuilder(); + for (final Map.Entry entry : asts.entrySet()) { + final ModuleBuilder moduleBuilder = YangParserListenerImpl.create(namespaceContext, entry.getKey().getName(), + walker, entry.getValue()).getModuleBuilder(); - try(InputStreamReader stream = new InputStreamReader(sources.get(entry.getKey()).getValue().openStream(), Charsets.UTF_8)) { - sourceToBuilder.put(moduleBuilder, CharStreams.toString(stream)); - } catch (final IOException e) { - throw new RuntimeException(e); - } + try(InputStreamReader stream = new InputStreamReader(sources.get(entry.getKey()).getValue().openStream(), Charsets.UTF_8)) { + sourceToBuilder.put(moduleBuilder, CharStreams.toString(stream)); + } catch (final IOException e) { + throw new RuntimeException(e); } - - return sourceToBuilder; } + return sourceToBuilder; + } + public List start(final Main.Params params) { + LOG.info("Starting {}, {} simulated devices starting on port {}", params.deviceCount, params.ssh ? "SSH" : "TCP", params.startingPort); + final Map moduleBuilders = parseSchemasToModuleBuilders(params); final NetconfServerDispatcher dispatcher = createDispatcher(moduleBuilders, params.exi, params.generateConfigsTimeout); @@ -210,11 +214,10 @@ public class NetconfDeviceSimulator implements Closeable { devicesChannels.add(server.channel()); openDevices.add(currentPort - 1); - } if(openDevices.size() == params.deviceCount) { - LOG.info("All simulated devices started successfully from port {} to {}", params.startingPort, currentPort); + LOG.info("All simulated devices started successfully from port {} to {}", params.startingPort, currentPort - 1); } else { LOG.warn("Not all simulated devices started successfully. Started devices ar on ports {}", openDevices); } @@ -251,8 +254,12 @@ public class NetconfDeviceSimulator implements Closeable { public void schemaSourceUnregistered(final PotentialSchemaSource potentialSchemaSource) {} }); - final FilesystemSchemaSourceCache cache = new FilesystemSchemaSourceCache<>(consumer, YangTextSchemaSource.class, params.schemasDir); - consumer.registerSchemaSourceListener(cache); + if(params.schemasDir != null) { + final FilesystemSchemaSourceCache cache = new FilesystemSchemaSourceCache<>(consumer, YangTextSchemaSource.class, params.schemasDir); + consumer.registerSchemaSourceListener(cache); + } + + addDefaultSchemas(consumer); final Map> asts = Maps.newHashMap(); for (final SourceIdentifier loadedSource : loadedSources) { @@ -269,6 +276,36 @@ public class NetconfDeviceSimulator implements Closeable { return toModuleBuilders(asts); } + private void addDefaultSchemas(final SharedSchemaRepository consumer) { + SourceIdentifier sId = new SourceIdentifier("ietf-netconf-monitoring", "2010-10-04"); + registerSource(consumer, "/META-INF/yang/ietf-netconf-monitoring.yang", sId); + + sId = new SourceIdentifier("ietf-yang-types", "2013-07-15"); + registerSource(consumer, "/META-INF/yang/ietf-yang-types@2013-07-15.yang", sId); + + sId = new SourceIdentifier("ietf-inet-types", "2010-09-24"); + registerSource(consumer, "/META-INF/yang/ietf-inet-types.yang", sId); + } + + private void registerSource(final SharedSchemaRepository consumer, final String resource, final SourceIdentifier sourceId) { + consumer.registerSchemaSource(new SchemaSourceProvider() { + @Override + public CheckedFuture getSource(final SourceIdentifier sourceIdentifier) { + return Futures.immediateCheckedFuture(new YangTextSchemaSource(sourceId) { + @Override + protected Objects.ToStringHelper addToStringAttributes(final Objects.ToStringHelper toStringHelper) { + return toStringHelper; + } + + @Override + public InputStream openStream() throws IOException { + return getClass().getResourceAsStream(resource); + } + }); + } + }, PotentialSchemaSource.create(sourceId, YangTextSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); + } + private static InetSocketAddress getAddress(final int port) { try { // TODO make address configurable