From: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Date: Fri, 14 Jun 2019 14:05:15 +0000 (+0000)
Subject: Correct netconf capability matching regex
X-Git-Tag: 0.5.0~139^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F89900%2F1;p=ccsdk%2Fcds.git

Correct netconf capability matching regex

Issue-ID: CCSDK-1403

Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I0e8efc620f09af4fc776fbbf9d4e08e721dc8c63
---

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
+}