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>

1 files changed, 7 insertions, 6 deletions

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.'() {