Merge "CmHandleState transition using state handler"

diff --git a/INFO.yaml b/INFO.yaml
index d1a6a49..88e186e 100755 (executable)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -24,7 +24,7 @@ project_category: ''
 project_lead: &onap_releng_ptl
     name: 'Toine Siebelink'
     email: 'toine.siebelink@est.tech'
-    id: 'toinesiebelink'
+    id: 'ToineSiebelink'
     company: 'Ericsson Software Technology'
     timezone: 'Europe/Dublin'
 primary_contact: *onap_releng_ptl
@@ -47,11 +47,6 @@ meetings:
       time: '08:00 America/New_York'
 committers:
     - <<: *onap_releng_ptl
-    - name: 'Toine Siebelink'
-      email: 'toine.siebelink@est.tech'
-      company: 'Ericsson Software Technology'
-      id: 'toinesiebelink'
-      timezone: 'Europe/Dublin'
     - name: 'Aditya Puthuparambil'
       email: 'aditya.puthuparambil@bell.ca'
       company: 'Bell Canada'

diff --git a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
index ff5204f..4413c6b 100644 (file)
--- a/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
+++ b/cps-service/src/main/java/org/onap/cps/utils/DataMapUtils.java
@@ -2,6 +2,7 @@
  *  ============LICENSE_START=======================================================
  *  Copyright (C) 2021 Pantheon.tech
  *  Modifications (C) 2021-2022 Nordix Foundation
+ *  Modifications Copyright (C) 2022 Bell Canada
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -90,10 +91,12 @@ public class DataMapUtils {
                 ));
     }
 
-    private static String getNodeIdentifier(final String xpath) {
-        final int fromIndex = xpath.lastIndexOf("/") + 1;
-        final int toIndex = xpath.indexOf("[", fromIndex);
-        return toIndex > 0 ? xpath.substring(fromIndex, toIndex) : xpath.substring(fromIndex);
+    private static String getNodeIdentifier(String xpath) {
+        if (xpath.endsWith("]")) {
+            xpath = xpath.substring(0, xpath.lastIndexOf('['));
+        }
+        final int fromIndex = xpath.lastIndexOf('/') + 1;
+        return xpath.substring(fromIndex);
     }
 
     private static String getNodeIdentifierWithPrefix(final String xpath, final String moduleNamePrefix) {

diff --git a/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
index 24e8061..7f2c638 100644 (file)
--- a/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/utils/DataMapUtilsSpec.groovy
@@ -30,7 +30,7 @@ class DataMapUtilsSpec extends Specification {
 
     def dataNode = buildDataNode(
             "/parent",[parentLeaf:'parentLeafValue', parentLeafList:['parentLeafListEntry1','parentLeafListEntry2']],[
-            buildDataNode('/parent/child-list[@id=1]',[listElementLeaf:'listElement1leafValue'],noChildren),
+            buildDataNode('/parent/child-list[@id=1/2]',[listElementLeaf:'listElement1leafValue'],noChildren),
             buildDataNode('/parent/child-list[@id=2]',[listElementLeaf:'listElement2leafValue'],noChildren),
             buildDataNode('/parent/child-object',[childLeaf:'childLeafValue'],
                     [buildDataNode('/parent/child-object/grand-child-object',[grandChildLeaf:'grandChildLeafValue'],noChildren)]
@@ -88,9 +88,11 @@ class DataMapUtilsSpec extends Specification {
         then: 'the correct modified node identifier is given'
             assert result == expectedNodeIdentifier
         where: 'the following parameters are used'
-            scenario                        | xPath                                       | expectedNodeIdentifier
-            'container xpath'               | '/bookstore'                                | 'sampleModuleName:bookstore'
-            'xpath contains list attribute' | '/bookstore/categories[@code=1]'            | 'sampleModuleName:categories'
+            scenario                                | xPath                                     | expectedNodeIdentifier
+            'container xpath'                       | '/bookstore'                              | 'sampleModuleName:bookstore'
+            'xpath contains list attribute'         | '/bookstore/categories[@code=1]'          | 'sampleModuleName:categories'
+            'xpath contains list attributes with /' | '/bookstore/categories[@code=1/2]'        | 'sampleModuleName:categories'
+
     }
 }
 

diff --git a/csit/plans/cps/testplan.txt b/csit/plans/cps/testplan.txt
index c0cf451..c597123 100644 (file)
--- a/csit/plans/cps/testplan.txt
+++ b/csit/plans/cps/testplan.txt
@@ -20,5 +20,6 @@ actuator
 cps-admin
 cps-data
 cps-model-sync
+cps-data-sync
 ncmp-passthrough
 cm-handle-query
\ No newline at end of file

diff --git a/csit/tests/cps-data-sync/cps-data-sync.robot b/csit/tests/cps-data-sync/cps-data-sync.robot
new file mode 100644 (file)
index 0000000..d37125b
--- /dev/null
+++ b/csit/tests/cps-data-sync/cps-data-sync.robot
@@ -0,0 +1,55 @@
+/*
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2022 Nordix Foundation
+ *  ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+*** Settings ***
+Documentation         NCMP
+
+Library               Collections
+Library               OperatingSystem
+Library               RequestsLibrary
+Library               BuiltIn
+
+Suite Setup           Create Session      CPS_URL    http://${CPS_CORE_HOST}:${CPS_CORE_PORT}
+
+*** Variables ***
+
+${auth}                   Basic Y3BzdXNlcjpjcHNyMGNrcyE=
+${ncmpBasePath}           /ncmp
+
+*** Test Cases ***
+Operational state goes to UNSYNCHRONIZED when data sync (flag) is enabled
+    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/data-sync
+    ${params}=           Create Dictionary  dataSyncEnabled=true
+    ${headers}=          Create Dictionary  Authorization=${auth}
+    ${response}=         PUT On Session     CPS_URL   ${uri}   params=${params}   headers=${headers}
+    Should Be Equal As Strings              ${response.status_code}   200
+    ${verifyUri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/state
+    ${verifyHeaders}=          Create Dictionary  Authorization=${auth}
+    ${verifyResponse}=         GET On Session     CPS_URL   ${verifyUri}   headers=${verifyHeaders}
+    ${verifyResponseJson}=    Set Variable        ${verifyResponse.json()['state']['dataSyncState']['operational']}
+    Should Be Equal As Strings                    ${verifyResponseJson['syncState']}   UNSYNCHRONIZED
+    Sleep    5
+
+Operational state goes to SYNCHRONIZED after sometime when data sync (flag) is enabled
+    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/state
+    ${headers}=          Create Dictionary  Authorization=${auth}
+    ${response}=         GET On Session     CPS_URL   ${uri}   headers=${headers}
+    ${responseJson}=    Set Variable        ${response.json()['state']['dataSyncState']['operational']}
+    Should Be Equal As Strings              ${responseJson['syncState']}   SYNCHRONIZED
\ No newline at end of file

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4c99192..8d3a0a3 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       notification.async.executor.time-out-value-in-ms: 2000
       NOTIFICATION_DATASPACE_FILTER_PATTERNS: '.*'
       TIMERS_ADVISED-MODULES-SYNC_SLEEP-TIME-MS: 2000
+      TIMERS_CM-HANDLE-DATA-SYNC_SLEEP-TIME-MS: 2000
     restart: unless-stopped
     depends_on:
       - dbpostgresql