Merge "Add some validations and new arguments"

diff --cc netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
index 1d8eda8f7891298dce5769734490bd3d44925c61,0ad0f1831c8d5dd3b4606b518c9d537c55301554..23ed222c37c1153acc41a1c815e179403879b8d3
--- 1/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
--- 2/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolParameters.java
@@@ -34,53 -33,80 +34,59 @@@ public class TesttoolParameters 
      private static final String PORT_KEY = "{PORT}";
      private static final String SSH = "{SSH}";
      private static final String ADDRESS_PORT = "{ADDRESS:PORT}";
 -    private static final String dest = "http://{ADDRESS:PORT}/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{PORT}-sim-device";
 -
 -    private static final String RESOURCE = "/config-template.xml";
 -    private InputStream stream;
 +    private static final String dest = "http://{ADDRESS:PORT}/restconf/config/network-topology:network-topology/topology/topology-netconf/";
  
 +    private static final String RESOURCE = "/config-template.json";
      @Arg(dest = "edit-content")
      public File editContent;
 -
      @Arg(dest = "async")
      public boolean async;
 -
      @Arg(dest = "thread-amount")
      public int threadAmount;
 -
      @Arg(dest = "throttle")
      public int throttle;
 -
      @Arg(dest = "auth")
      public ArrayList<String> auth;
 -
      @Arg(dest = "controller-destination")
      public String controllerDestination;
 -
      @Arg(dest = "schemas-dir")
      public File schemasDir;
 -
      @Arg(dest = "devices-count")
      public int deviceCount;
 -
      @Arg(dest = "devices-per-port")
      public int devicesPerPort;
 -
      @Arg(dest = "starting-port")
      public int startingPort;
 -
      @Arg(dest = "generate-config-connection-timeout")
      public int generateConfigsTimeout;
 -
      @Arg(dest = "generate-config-address")
      public String generateConfigsAddress;
 -
      @Arg(dest = "distro-folder")
      public File distroFolder;
 -
      @Arg(dest = "generate-configs-batch-size")
      public int generateConfigBatchSize;
 -
      @Arg(dest = "ssh")
      public boolean ssh;
 -
      @Arg(dest = "exi")
      public boolean exi;
 -
      @Arg(dest = "debug")
      public boolean debug;
 -
      @Arg(dest = "notification-file")
      public File notificationFile;
 -
      @Arg(dest = "md-sal")
      public boolean mdSal;
 -
      @Arg(dest = "initial-config-xml-file")
      public File initialConfigXMLFile;
 -
      @Arg(dest = "time-out")
      public long timeOut;
 +    private InputStream stream;
  
+     @Arg(dest = "ip")
+     public String ip;
+ 
+     @Arg(dest = "thread-pool-size")
+     public int threadPoolSize;
+ 
      static ArgumentParser getParser() {
          final ArgumentParser parser = ArgumentParsers.newArgumentParser("netconf testtool");