Merge "Remove a FindBugs suppression"

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / config / ConfigurationBuilder.java

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 d9be6adb2fdd585666ee9bd57ba76c05caca1ccc..0a705b373310bbee03f65bdd39bd5f5273f152aa 100644 (file)
--- 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
@@ -14,6 +14,7 @@ import org.opendaylight.netconf.auth.AuthProvider;
 import org.opendaylight.netconf.test.tool.TesttoolParameters;
 import org.opendaylight.netconf.test.tool.operations.OperationsCreator;
 import org.opendaylight.netconf.test.tool.rpchandler.RpcHandler;
+import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 
 public class ConfigurationBuilder {
 
@@ -48,7 +49,7 @@ public class ConfigurationBuilder {
         return this;
     }
 
-    public ConfigurationBuilder setModels(final Set<String> models) {
+    public ConfigurationBuilder setModels(final Set<YangModuleInfo> models) {
         this.configuration.setModels(models);
         return this;
     }
@@ -145,6 +146,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;
     }