Merge "BugFix: 500 Server error when upgrade and service restart with…

… data in DB"
onap · Sep 30, 2024 · 78674d7 · 78674d7
2 parents 4baa75b + fe846d2
commit 78674d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java b/...-service/src/main/java/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManager.java
@@ -140,7 +140,7 @@ public void updateCmHandleTrustLevel(final String cmHandleId,
      */
     public TrustLevel getEffectiveTrustLevel(final String cmHandleId) {
         final TrustLevel dmiTrustLevel = TrustLevel.COMPLETE; // TODO: CPS-2375
-        final TrustLevel cmHandleTrustLevel = trustLevelPerCmHandle.get(cmHandleId);
+        final TrustLevel cmHandleTrustLevel = trustLevelPerCmHandle.getOrDefault(cmHandleId, TrustLevel.NONE);
         return dmiTrustLevel.getEffectiveTrustLevel(cmHandleTrustLevel);
     }
 

diff --git a/.../src/test/groovy/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManagerSpec.groovy b/.../src/test/groovy/org/onap/cps/ncmp/impl/inventory/trustlevel/TrustLevelManagerSpec.groovy
@@ -149,6 +149,11 @@ class TrustLevelManagerSpec extends Specification {
             assert effectiveTrustLevel == TrustLevel.NONE
     }
 
+    def 'Select effective trust level  when the trust level caches are empty (restart case)'() {
+        expect: 'effective trust level is NONE when cm-1 does not exist in the cache'
+            assert objectUnderTest.getEffectiveTrustLevel('ch-1') == TrustLevel.NONE
+    }
+
     def 'CmHandle trust level removed'() {
         given: 'a cm handle'
             trustLevelPerCmHandle.put('ch-1', TrustLevel.COMPLETE)