From 0af60de4fbb3a3e6c828e179c667b173b1539b62 Mon Sep 17 00:00:00 2001 From: JosephKeenan Date: Fri, 20 Aug 2021 10:33:54 +0100 Subject: CPS-505 Retrieving modules for new CM handle -Added some production code for getting missing modules for new CM handle -Groovy test template added by Toine for getting msissing modules -Added json example for test -Modified test to check map contents -Differentiated restTemplate calls based on URL -Fixed code review comment`s -Groovy test now passing -Modified behaviour for sending moduleReferences and added null to namespace (jira to follow) -Combined NetworkCmProxyDataServiceImpl tests into one class & addressed code review comments Issue-ID: CPS-505 Change-Id: I91ef65467496caea7834ba2e8af99cfe58d4f880 Signed-off-by: JosephKeenan --- cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java | 5 +++-- .../src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java | 4 ++-- .../src/main/java/org/onap/cps/spi/model/ModuleReference.java | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'cps-service') diff --git a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java index d17408526..5c40331d7 100644 --- a/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java +++ b/cps-service/src/main/java/org/onap/cps/api/CpsModuleService.java @@ -51,11 +51,12 @@ public interface CpsModuleService { * @param dataspaceName Dataspace name * @param schemaSetName schema set name * @param newYangResourcesModuleNameToContentMap YANG resources map where key is a module name and value is content - * @param moduleReferenceList List of YANG resources module references + * @param existingModuleReferences List of YANG resources module references of the modules + * needed for this handle that are already in CPS */ void createSchemaSetFromModules(@NonNull String dataspaceName, @NonNull String schemaSetName, @NonNull Map newYangResourcesModuleNameToContentMap, - @NonNull List moduleReferenceList); + @NonNull List existingModuleReferences); /** * Read schema set in the given dataspace. diff --git a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java index c65f82781..0597d380a 100644 --- a/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java +++ b/cps-service/src/main/java/org/onap/cps/api/impl/CpsModuleServiceImpl.java @@ -53,9 +53,9 @@ public class CpsModuleServiceImpl implements CpsModuleService { @Override public void createSchemaSetFromModules(final String dataspaceName, final String schemaSetName, final Map newYangResourcesModuleNameToContentMap, - final List moduleReferenceList) { + final List existingModuleReferences) { cpsModulePersistenceService.storeSchemaSetFromModules(dataspaceName, schemaSetName, - newYangResourcesModuleNameToContentMap, moduleReferenceList); + newYangResourcesModuleNameToContentMap, existingModuleReferences); } diff --git a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java b/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java index 6aa68cf9e..f9aa2b590 100644 --- a/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java +++ b/cps-service/src/main/java/org/onap/cps/spi/model/ModuleReference.java @@ -38,4 +38,5 @@ public class ModuleReference implements Serializable { private String name; private String namespace; private String revision; + } -- cgit 1.2.3-korg