summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>2019-06-14 14:05:15 +0000
committerAbdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>2019-06-14 14:05:15 +0000
commitc32afa8163a3d088f17a68884d819e3cfcc7a396 (patch)
treeb8cd5fa9212f15ac82882f79ffe78ca5a3ee93b7
parent39167cccae3271603819aa39c6476e434c759533 (diff)
Correct netconf capability matching regex
Issue-ID: CCSDK-1403 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I0e8efc620f09af4fc776fbbf9d4e08e721dc8c63
-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
+}