Add multi-threaded Integration Test for Module Sync

- Add tests for multi threaded scenarios around module sync
- Disabled ModuleSyncWatchdog timer using long delay and interval
- Call Module Sync method as needed for more control
  (sometimes it needs to be triggered twice like retry use cases as designed)
- Improve NCMP performance test setup (consistent naming etc.)
- Rename some production code method names to better reflect functionality
- Disabled intermittent failing test for create cm handle as it is not asserting the correct message
- Improved Code Coverage ModuleSyncWatchdog

Issue-ID: CPS-2462
Change-Id: Ia907af77d2037309f1bbb73ea671679b788bab9e
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>

3 files changed, 3 insertions, 3 deletions

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