From 05d3838f8deab82b6da351819b1531b8267afb66 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 26 Sep 2018 11:47:19 +0200 Subject: [PATCH] Honor EXI flag in testtool NETCONF test tool should honor the exi flag and translate it to proper capabilities. Change-Id: I50acf9188eb5fd2aea60d593dfd9713e54badda4 Signed-off-by: Robert Varga --- .../org/opendaylight/netconf/test/tool/TesttoolParameters.java | 2 +- .../netconf/test/tool/config/ConfigurationBuilder.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/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 index 5d8b0bf3ab..9115621bd3 100644 --- a/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 @@ -81,7 +81,7 @@ public class TesttoolParameters { @Arg(dest = "ssh") public boolean ssh; @Arg(dest = "exi") - public boolean exi; + public boolean exi = true; @Arg(dest = "debug") public boolean debug; @Arg(dest = "notification-file") diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/ConfigurationBuilder.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/ConfigurationBuilder.java index d9be6adb2f..30b0e85f58 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/ConfigurationBuilder.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/ConfigurationBuilder.java @@ -145,6 +145,8 @@ public class ConfigurationBuilder { this.configuration.setInitialConfigXMLFile(testtoolParameters.initialConfigXMLFile); this.configuration.setNotificationFile(testtoolParameters.notificationFile); this.configuration.setSchemasDir(testtoolParameters.schemasDir); + this.configuration.setCapabilities(testtoolParameters.exi ? Configuration.DEFAULT_BASE_CAPABILITIES_EXI + : Configuration.DEFAULT_BASE_CAPABILITIES); return this; } -- 2.36.6