diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2018-06-05 16:40:13 -0400 |
|---|---|---|
| committer |   Patrick Brady <pb071s@att.com> | 2018-06-07 18:12:09 +0000 |
| commit | aa40d7357b5445de9aac67bc8beee1a3a6361bb2 (patch) | |
| tree | 9e95c15477e98aa6e827d0e8470ce9848138f8af /appc-config | |
| parent | 07949a86e70e61771a0cac4dc2dc60fa1281f253 (diff) | |
Fix delimiter string for xml-download CDT action
The ssh session is waiting until the </nc:rpc-reply> delimiter is received,
but the last item to be sent in the pipe by the device is the trailing
]]>]]> as specified in the command (whether commitCmd or loadConfigurationString).
Change-Id: I3a7c5df3f06eb648a0551d7767f90acef533c5ee
Issue-ID: APPC-973
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'appc-config')
| -rw-r--r-- | appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java index 66e24f477..6ff4a8688 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java @@ -383,7 +383,7 @@ public ConfigStatus configure(String key, Map<String, String> parameters, SvcLog loadConfigurationString = loadConfigurationString + "]]>]]>"; sshJcraftWrapper.send(loadConfigurationString); DebugLog.printAriDebug(fnName, ":After sending loadConfigurationString"); - response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 600000, ""); + response = sshJcraftWrapper.receiveUntil("]]>]]>", 600000, ""); if (response.indexOf("rpc-error") != -1) { DebugLog.printAriDebug(fnName, "Error from device: Response from device had 'rpc-error'"); DebugLog.printAriDebug(fnName, "response=\n" + response + "\n"); @@ -393,7 +393,7 @@ public ConfigStatus configure(String key, Map<String, String> parameters, SvcLog DebugLog.printAriDebug(fnName, ":LoadConfiguration was a success, sending commit cmd"); sshJcraftWrapper.send(commitCmd); DebugLog.printAriDebug(fnName, ":After sending commitCmd"); - response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 180000, ""); + response = sshJcraftWrapper.receiveUntil("]]>]]>", 180000, ""); if (response.indexOf("rpc-error") != -1) { DebugLog.printAriDebug(fnName, "Error from device: Response from device had 'rpc-error'"); DebugLog.printAriDebug(fnName, "response=\n" + response + "\n"); |