From 6fb1e85fd1cdb20cb8f64f81c188c29c0391ab2a Mon Sep 17 00:00:00 2001
From: ToineSiebelink <toine.siebelink@est.tech>
Date: Tue, 21 Jan 2025 13:35:03 +0000
Subject: Remove retry mechanism for duplicate module(resource) errors

- CM Handle with problems will go into 'LOCKED' state and retried using existing business logic

Issue-ID: CPS-2555
Change-Id: I563f6bc536d8fd8c6675891c62318ff2fb43fea6
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
---
 .../impl/inventory/sync/ModuleSyncService.java     | 24 ++++++++--------------
 .../inventory/sync/ModuleSyncServiceSpec.groovy    | 13 ++++++------
 2 files changed, 15 insertions(+), 22 deletions(-)

(limited to 'cps-ncmp-service/src')

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
index 9534cf35b1..041daa0927 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncService.java
@@ -35,8 +35,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.api.CpsAnchorService;
 import org.onap.cps.api.CpsDataService;
 import org.onap.cps.api.CpsModuleService;
-import org.onap.cps.api.exceptions.AlreadyDefinedException;
-import org.onap.cps.api.exceptions.DuplicatedYangResourceException;
 import org.onap.cps.api.model.ModuleReference;
 import org.onap.cps.ncmp.impl.inventory.models.YangModelCmHandle;
 import org.onap.cps.utils.ContentType;
@@ -101,20 +99,14 @@ public class ModuleSyncService {
     private void syncAndCreateSchemaSet(final YangModelCmHandle yangModelCmHandle, final String schemaSetName) {
         if (isNewSchemaSet(schemaSetName)) {
             final ModuleDelta moduleDelta = getModuleDelta(yangModelCmHandle);
-            try {
-                log.info("Creating Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
-                cpsModuleService.createSchemaSetFromModules(
-                        NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
-                        schemaSetName,
-                        moduleDelta.newModuleNameToContentMap,
-                        moduleDelta.allModuleReferences
-                );
-                log.info("Successfully created Schema Set {} for CM Handle {}",
-                    schemaSetName, yangModelCmHandle.getId());
-            } catch (final AlreadyDefinedException | DuplicatedYangResourceException exception) {
-                log.warn("Schema Set {} already exists, no need to (re)create it for {}",
-                    schemaSetName, yangModelCmHandle.getId());
-            }
+            log.info("Creating Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
+            cpsModuleService.createSchemaSetFromModules(
+                    NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME,
+                    schemaSetName,
+                    moduleDelta.newModuleNameToContentMap,
+                    moduleDelta.allModuleReferences
+            );
+            log.info("Successfully created Schema Set {} for CM Handle {}", schemaSetName, yangModelCmHandle.getId());
         }
     }
 
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncServiceSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncServiceSpec.groovy
index f8adfe5578..7881375762 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncServiceSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/impl/inventory/sync/ModuleSyncServiceSpec.groovy
@@ -90,20 +90,21 @@ class ModuleSyncServiceSpec extends Specification {
             'without' | ''
     }
 
-    def 'Attempt Sync models for a cm handle with existing schema set (#exception).'() {
+    def 'Attempt Sync models for a cm handle with existing schema set (#originalException).'() {
         given: 'a cm handle to be synced'
             def yangModelCmHandle = createAdvisedCmHandle('existing tag')
         and: 'dmi returns no new yang resources'
             mockDmiModelOperations.getNewYangResourcesFromDmi(*_) >> [:]
         and: 'already defined exception occurs when creating schema (existing)'
-            mockCpsModuleService.createSchemaSetFromModules(*_) >> { throw exception  }
+            mockCpsModuleService.createSchemaSetFromModules(*_) >> { throw originalException  }
         when: 'module sync is triggered'
             objectUnderTest.syncAndCreateSchemaSetAndAnchor(yangModelCmHandle)
-        then: 'no exception is thrown up'
-            noExceptionThrown()
+        then: 'same exception is thrown up'
+            def thrownException = thrown(Exception)
+            assert thrownException == originalException
         where: 'following exceptions occur'
-            exception << [ AlreadyDefinedException.forSchemaSet('', '', null),
-                           new DuplicatedYangResourceException('', '', null) ]
+            originalException << [AlreadyDefinedException.forSchemaSet('', '', null),
+                                  new DuplicatedYangResourceException('', '', null) ]
     }
 
     def 'Model upgrade without using Module Set Tags (legacy) where the modules are in database.'() {
-- 
cgit 1.2.3-korg