From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 26 Sep 2018 09:47:19 +0000 (+0200)
Subject: Honor EXI flag in testtool
X-Git-Tag: release/fluorine-sr1~15
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F76455%2F1;p=netconf.git

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 <robert.varga@pantheon.tech>
---

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 368c186fe5..d2068df565 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;
     }