From: Toine Siebelink <toine.siebelink@est.tech>
Date: Tue, 14 Dec 2021 16:23:49 +0000 (+0000)
Subject: Merge "Changing putOperationWithJson to postOperationWithJson"
X-Git-Tag: mr/823/126723/7~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=cps.git;a=commitdiff_plain;h=b7485757b6fd56c2b32cd90c5ad1d0b5bd7b3a6a

Merge "Changing putOperationWithJson to postOperationWithJson"
---

b7485757b6fd56c2b32cd90c5ad1d0b5bd7b3a6a
diff --cc cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
index 62a0922d0,bd86cd0c3..7ded95fa0
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/NetworkCmProxyDataServiceImpl.java
@@@ -306,19 -302,9 +301,18 @@@ public class NetworkCmProxyDataServiceI
          }
      }
  
 +    private void attemptToDeleteSchemaSetWithCascade(final String schemaSetName) {
 +        try {
 +            cpsModuleService.deleteSchemaSet(NFP_OPERATIONAL_DATASTORE_DATASPACE_NAME, schemaSetName,
 +                CASCADE_DELETE_ALLOWED);
 +        } catch (final Exception e) {
 +            log.warn("Schema set {} delete failed, reason {}", schemaSetName, e.getMessage());
 +        }
 +    }
 +
      private void syncAndCreateSchemaSet(final PersistenceCmHandle persistenceCmHandle) {
- 
          final List<ModuleReference> moduleReferencesFromCmHandle =
-             toModuleReferences(dmiModelOperations.getModuleReferences(persistenceCmHandle));
+             dmiModelOperations.getModuleReferences(persistenceCmHandle);
          final List<ModuleReference> existingModuleReferences = new ArrayList<>();
          final List<ModuleReference> unknownModuleReferences = new ArrayList<>();
          prepareModuleSubsets(moduleReferencesFromCmHandle, existingModuleReferences, unknownModuleReferences);