5 files changed, 27 insertions, 4 deletions
diff --git a/integration-test/src/test/resources/application-module-sync-delayed.yml b/integration-test/src/test/resources/application-module-sync-delayed.yml
new file mode 100644
index 0000000000..7b9c6aea4f
--- /dev/null
+++ b/integration-test/src/test/resources/application-module-sync-delayed.yml
@@ -0,0 +1,23 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2024 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=========================================================
+
+test:
+  ncmp:
+    timers:
+      advised-modules-sync:
+        initial-delay-ms: 600000
+
diff --git a/integration-test/src/test/resources/application.yml b/integration-test/src/test/resources/application.yml
index 853797aac5..b786a3d4c5 100644
--- a/integration-test/src/test/resources/application.yml
+++ b/integration-test/src/test/resources/application.yml
@@ -179,7 +179,7 @@ ncmp:
 
   timers:
     advised-modules-sync:
-      sleep-time-ms: 1000
+      sleep-time-ms: 1000000
     cm-handle-data-sync:
       sleep-time-ms: 30000
     subscription-forwarding:
diff --git a/integration-test/src/test/resources/data/ncmp-registry/innerNode.json b/integration-test/src/test/resources/data/inventory/cmHandleTemplate.json
index b6c65f3763..6577f4e560 100644
--- a/integration-test/src/test/resources/data/ncmp-registry/innerNode.json
+++ b/integration-test/src/test/resources/data/inventory/cmHandleTemplate.json
@@ -1,6 +1,6 @@
 {
-  "id": "cm-CMHANDLE_ID_HERE",
-  "alternate-id": "alt-CMHANDLE_ID_HERE",
+  "id": "cm-CM_HANDLE_ID_HERE",
+  "alternate-id": "alt-CM_HANDLE_ID_HERE",
   "module-set-tag": "my-module-set-tag",
   "dmi-service-name": "http://ncmp-dmi-plugin-stub:8080",
   "dmi-data-service-name": "",
@@ -21,4 +21,4 @@
       }
     }
   }
-}
-\ No newline at end of file
+}
diff --git a/integration-test/src/test/resources/data/ncmp-registry/innerCmHandleNode.json b/integration-test/src/test/resources/data/inventory/cmHandleWithAlternateIdTemplate.json
index 88446c4a0f..88446c4a0f 100644
--- a/integration-test/src/test/resources/data/ncmp-registry/innerCmHandleNode.json
+++ b/integration-test/src/test/resources/data/inventory/cmHandleWithAlternateIdTemplate.json
diff --git a/integration-test/src/test/resources/data/ncmp-registry/dmi-registry@2024-02-23.yang b/integration-test/src/test/resources/data/inventory/dmi-registry@2024-02-23.yang
index d7b4ff7550..d7b4ff7550 100644
--- a/integration-test/src/test/resources/data/ncmp-registry/dmi-registry@2024-02-23.yang
+++ b/integration-test/src/test/resources/data/inventory/dmi-registry@2024-02-23.yang