summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-06-18 15:03:38 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-18 15:03:38 +0000
commitb8e4095db0157cf12ce78da64234d0bf75f0286a (patch)
tree1cb4e7452f57a6c4cbea91d34747602684026d2d
parent1d9569fd524d47908b08e9578a5d104a195f03d6 (diff)
parentc32afa8163a3d088f17a68884d819e3cfcc7a396 (diff)
Merge "Correct netconf capability matching regex"
-rw-r--r--ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/utils/NetconfConstant.kt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/utils/NetconfConstant.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/utils/NetconfConstant.kt
index 8722bb031..03177e8ec 100644
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/utils/NetconfConstant.kt
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/utils/NetconfConstant.kt
@@ -79,7 +79,7 @@ object RpcMessageUtils {
const val INTERLEAVE_CAPABILITY_STRING = "urn:ietf:params:netconf:capability:interleave:1.0"
- const val CAPABILITY_REGEX = "capability>\\s*(.*?)\\s*capability>"
+ const val CAPABILITY_REGEX = "capability>\\s*(.*?)\\s*</capability>"
const val SESSION_ID_REGEX = "session-id>\\s*(.*?)\\s*session-id>"
@@ -87,4 +87,4 @@ object RpcMessageUtils {
const val NETCONF_10_CAPABILITY = "urn:ietf:params:netconf:base:1.0"
const val NETCONF_11_CAPABILITY = "urn:ietf:params:netconf:base:1.1"
-} \ No newline at end of file
+}