diff options
Diffstat (limited to 'cps-service/src/main')
3 files changed, 42 insertions, 5 deletions
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 e8c3e7775c..2928464461 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 @@ -53,7 +53,7 @@ public interface CpsModuleService { * @param newModuleNameToContentMap YANG resources map where key is a module name and value is content * @param allModuleReferences All YANG resource module references */ - void createOrUpgradeSchemaSetFromModules(String dataspaceName, String schemaSetName, + void createSchemaSetFromModules(String dataspaceName, String schemaSetName, Map<String, String> newModuleNameToContentMap, Collection<ModuleReference> allModuleReferences); @@ -94,6 +94,19 @@ public interface CpsModuleService { */ void deleteSchemaSetsWithCascade(String dataspaceName, Collection<String> schemaSetNames); + + /** + * upgrade schema sets with existing or new modules. + * + * @param dataspaceName dataspace name + * @param schemaSetName schema set name + * @param newModuleNameToContentMap YANG resources map where key is a module name and value is content + * @param allModuleReferences All YANG resource module references + */ + void upgradeSchemaSetFromModules(final String dataspaceName, final String schemaSetName, + final Map<String, String> newModuleNameToContentMap, + final Collection<ModuleReference> allModuleReferences); + /** * Retrieve module references for the given dataspace name. * 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 d274b51bf6..5337237846 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 @@ -66,9 +66,9 @@ public class CpsModuleServiceImpl implements CpsModuleService { } @Override - public void createOrUpgradeSchemaSetFromModules(final String dataspaceName, final String schemaSetName, - final Map<String, String> newModuleNameToContentMap, - final Collection<ModuleReference> allModuleReferences) { + public void createSchemaSetFromModules(final String dataspaceName, final String schemaSetName, + final Map<String, String> newModuleNameToContentMap, + final Collection<ModuleReference> allModuleReferences) { cpsValidator.validateNameCharacters(dataspaceName, schemaSetName); cpsModulePersistenceService.storeSchemaSetFromModules(dataspaceName, schemaSetName, newModuleNameToContentMap, allModuleReferences); @@ -125,6 +125,17 @@ public class CpsModuleServiceImpl implements CpsModuleService { } @Override + public void upgradeSchemaSetFromModules(final String dataspaceName, final String schemaSetName, + final Map<String, String> newModuleNameToContentMap, + final Collection<ModuleReference> allModuleReferences) { + cpsValidator.validateNameCharacters(dataspaceName, schemaSetName); + cpsModulePersistenceService.updateSchemaSetFromModules(dataspaceName, schemaSetName, + newModuleNameToContentMap, allModuleReferences); + yangTextSchemaSourceSetCache.removeFromCache(dataspaceName, schemaSetName); + } + + + @Override public Collection<ModuleReference> getYangResourceModuleReferences(final String dataspaceName) { cpsValidator.validateNameCharacters(dataspaceName); return cpsModulePersistenceService.getYangResourceModuleReferences(dataspaceName); diff --git a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java index beb3d4fa8c..aaca2ee5b5 100755 --- a/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java +++ b/cps-service/src/main/java/org/onap/cps/spi/CpsModulePersistenceService.java @@ -43,7 +43,7 @@ public interface CpsModulePersistenceService { void storeSchemaSet(String dataspaceName, String schemaSetName, Map<String, String> yangResourcesNameToContentMap); /** - * Stores a schema set from new modules and existing modules. + * Stores a new schema set from new modules and existing modules. * * @param dataspaceName Dataspace name * @param schemaSetName Schema set name @@ -54,6 +54,19 @@ public interface CpsModulePersistenceService { Map<String, String> newModuleNameToContentMap, Collection<ModuleReference> allModuleReferences); /** + * Update an existing schema set from new modules and existing modules. + * + * @param dataspaceName Dataspace name + * @param schemaSetName Schema set name + * @param newModuleNameToContentMap YANG resources map where key is a module name and value is content + * @param allModuleReferences All YANG resources module references + */ + void updateSchemaSetFromModules(final String dataspaceName, final String schemaSetName, + final Map<String, String> newModuleNameToContentMap, + final Collection<ModuleReference> allModuleReferences); + + + /** * Get all schema sets for a given dataspace. * * @param dataspaceName dataspace name. |