Change naming in testtool payload template

Change-Id: Ib252a846645e6392222c8fe619cbe6bf0234d754
Signed-off-by: miroslav.kovac <miroslav.kovac@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 23ed222c37c1153acc41a1c815e179403879b8d3..f2f3e09173361561722adfff9a89153bfea78183 100644 (file)
--- 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
@@ -32,7 +32,7 @@ public class TesttoolParameters {
 
     private static final String HOST_KEY = "{HOST}";
     private static final String PORT_KEY = "{PORT}";
-    private static final String SSH = "{SSH}";
+    private static final String TCP_ONLY = "{TCP_ONLY}";
     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/";
 
@@ -373,8 +373,8 @@ public class TesttoolParameters {
             while (messageBuilder.indexOf(PORT_KEY) != -1)
                 messageBuilder.replace(messageBuilder.indexOf(PORT_KEY), messageBuilder.indexOf(PORT_KEY) + PORT_KEY.length(), Integer.toString(openDevice));
         }
-        if (editContentString.contains(SSH)) {
-            messageBuilder.replace(messageBuilder.indexOf(SSH), messageBuilder.indexOf(SSH) + SSH.length(), Boolean.toString(ssh));
+        if (editContentString.contains(TCP_ONLY)) {
+            messageBuilder.replace(messageBuilder.indexOf(TCP_ONLY), messageBuilder.indexOf(TCP_ONLY) + TCP_ONLY.length(), Boolean.toString(!ssh));
         }
         return messageBuilder.toString();
     }

diff --git a/netconf/tools/netconf-testtool/src/main/resources/config-template.xml b/netconf/tools/netconf-testtool/src/main/resources/config-template.xml
index ea237a7b17619fcb467012e72d0e03db9ec701b6..70287b22465f749e5f469a058931f7a95c86f3eb 100644 (file)
--- a/netconf/tools/netconf-testtool/src/main/resources/config-template.xml
+++ b/netconf/tools/netconf-testtool/src/main/resources/config-template.xml
@@ -4,6 +4,6 @@
     <port xmlns="urn:opendaylight:netconf-node-topology">{PORT}</port>
     <username xmlns="urn:opendaylight:netconf-node-topology">admin</username>
     <password xmlns="urn:opendaylight:netconf-node-topology">admin</password>
-    <tcp-only xmlns="urn:opendaylight:netconf-node-topology">{SSH}</tcp-only>
+    <tcp-only xmlns="urn:opendaylight:netconf-node-topology">{TCP_ONLY}</tcp-only>
     <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
 </node>
\ No newline at end of file