From 4b11379209aafd2bcaf9a9ee874dcb1569bdde8f Mon Sep 17 00:00:00 2001 From: Dominik Vrbovsky Date: Tue, 14 Dec 2021 15:56:55 +0100 Subject: [PATCH] Update rest-perf-client tool to RFC 8040 Rework old draft-bierman-netconf-restconf-02 paths to RFC 8040 paths. Set default auth credentials. JIRA: NETCONF-797 Change-Id: I35338b66a54b574d5eb45c241fb76c2ed3f2aced Signed-off-by: Dominik Vrbovsky --- .../netconf/test/tool/client/http/perf/Parameters.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java index 78f3eafb37..ad675f8595 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/http/perf/Parameters.java @@ -13,7 +13,7 @@ import java.io.File; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.ArrayList; +import java.util.List; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.annotation.Arg; import net.sourceforge.argparse4j.inf.ArgumentParser; @@ -51,7 +51,7 @@ public class Parameters { public int throttle; @Arg(dest = "auth") - public ArrayList auth; + public List auth; @Arg(dest = "timeout") public long timeout; @@ -75,8 +75,8 @@ public class Parameters { parser.addArgument("--destination") .type(String.class) - .setDefault("/restconf/config/network-topology:network-topology/topology/topology-netconf/node/" - + "{DEVICE_PORT}-sim-device/yang-ext:mount/cisco-vpp:vpp/bridge-domains/bridge-domain/a") + .setDefault("/rests/data/network-topology:network-topology/topology=topology-netconf/node=" + + "{DEVICE_PORT}-sim-device/yang-ext:mount/cisco-vpp:vpp/bridge-domains=bridge-domain/a") .help("Destination to send the requests to after the ip:port part of the uri. " + "Use {DEVICE_PORT} tag to use the device-port-range-start argument") .dest("destination"); @@ -122,6 +122,7 @@ public class Parameters { .dest("throttle"); parser.addArgument("--auth") + .setDefault("admin", "admin") .nargs(2) .help("Username and password for HTTP basic authentication in order username password.") .dest("auth"); -- 2.36.6