Controller Blueprints Microservice

Add resource assignment enhancement and validation to blueprint validation and enhancement.

Change-Id: I547760012e7014cfbb7a1e3a1d8ffb77edc9b6a2
Issue-ID: CCSDK-562
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

2 files changed, 36 insertions, 13 deletions

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
index 8e98f947..ef3b4a48 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
@@ -25,12 +25,13 @@ import org.jetbrains.annotations.NotNull;
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;

 import org.onap.ccsdk.apps.controllerblueprints.core.ConfigModelConstant;

 import org.onap.ccsdk.apps.controllerblueprints.core.data.*;

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerDefaultService;

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService;

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;

+import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhancerDefaultService;

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;

 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

+import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.ResourceAssignmentEnhancerService;

 import org.springframework.stereotype.Service;

 

 import java.util.HashMap;

@@ -48,14 +49,18 @@ public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {
 

     private static EELFLogger log = EELFManager.getInstance().getLogger(BluePrintEnhancerService.class);

 

+    private ResourceAssignmentEnhancerService resourceAssignmentEnhancerService;

+

     private Map<String, DataType> recipeDataTypes = new HashMap<>();

 

-    public BluePrintEnhancerService(BluePrintRepoService bluePrintEnhancerRepoDBService) {

-        super(bluePrintEnhancerRepoDBService);

+    public BluePrintEnhancerService(ResourceDefinitionRepoService resourceDefinitionRepoService,

+                                    ResourceAssignmentEnhancerService resourceAssignmentEnhancerService) {

+        super(resourceDefinitionRepoService);

+        this.resourceAssignmentEnhancerService = resourceAssignmentEnhancerService;

     }

 

     @Override

-    public void enrichTopologyTemplate(@NotNull ServiceTemplate serviceTemplate) throws BluePrintException{

+    public void enrichTopologyTemplate(@NotNull ServiceTemplate serviceTemplate) throws BluePrintException {

         super.enrichTopologyTemplate(serviceTemplate);

 

         // Update the Recipe Inputs and DataTypes

@@ -101,7 +106,7 @@ public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {
             // Modified for ONAP converted Object to JsonNode

             JsonNode recipeNames = nodeTemplate.getProperties().get(ConfigModelConstant.PROPERTY_RECIPE_NAMES);

 

-            log.info("Processing Receipe Names : {} ", recipeNames);

+            log.info("Processing Recipe Names : {} ", recipeNames);

 

             if (recipeNames != null && recipeNames.isArray() && recipeNames.size() > 0) {

 

@@ -159,6 +164,9 @@ public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {
                         JacksonUtils.getListFromJson(resourceAssignmentContent, ResourceAssignment.class);

 

                 Preconditions.checkNotNull(resourceAssignments, "Failed to Processing Resource Mapping " + resourceAssignmentContent);

+                // Enhance Resource Assignment

+                resourceAssignmentEnhancerService.enhanceBluePrint(this, resourceAssignments);

+

                 dataTypeProperties = new HashMap<>();

 

                 for (ResourceAssignment resourceAssignment : resourceAssignments) {

@@ -167,9 +175,6 @@ public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {
                             && resourceAssignment.getProperty() != null

                             && StringUtils.isNotBlank(resourceAssignment.getName())) {

 

-                        // Enrich the Property Definition

-                        super.enrichPropertyDefinition(resourceAssignment.getName(), resourceAssignment.getProperty());

-

                         dataTypeProperties.put(resourceAssignment.getName(), resourceAssignment.getProperty());

 

                     }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDefinitionRepoDBService.java
index 5510e480..16cc8415 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintRepoDBService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDefinitionRepoDBService.java
@@ -23,28 +23,35 @@ import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;

 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;

 import org.onap.ccsdk.apps.controllerblueprints.core.data.*;

-import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRepoService;

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDefinition;

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceDefinitionRepoService;

 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ModelType;

+import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;

 import org.onap.ccsdk.apps.controllerblueprints.service.repository.ModelTypeRepository;

+import org.onap.ccsdk.apps.controllerblueprints.service.repository.ResourceDictionaryRepository;

 import org.springframework.stereotype.Service;

 import reactor.core.publisher.Mono;

 

 import java.util.Optional;

 

 /**

- * BluePrintRepoDBService

+ * ResourceDefinitionRepoDBService

  *

  * @author Brinda Santh

  */

 @Service

 @SuppressWarnings("unused")

-public class BluePrintRepoDBService implements BluePrintRepoService {

+public class ResourceDefinitionRepoDBService implements ResourceDefinitionRepoService {

 

     private ModelTypeRepository modelTypeRepository;

+    private ResourceDictionaryRepository resourceDictionaryRepository;

+

     @SuppressWarnings("unused")

-    public BluePrintRepoDBService(ModelTypeRepository modelTypeRepository) {

+    public ResourceDefinitionRepoDBService(ModelTypeRepository modelTypeRepository,

+                                           ResourceDictionaryRepository resourceDictionaryRepository) {

         this.modelTypeRepository = modelTypeRepository;

+        this.resourceDictionaryRepository = resourceDictionaryRepository;

     }

 

     @Override

@@ -72,6 +79,17 @@ public class BluePrintRepoDBService implements BluePrintRepoService {
         return getModelType(capabilityDefinitionName, CapabilityDefinition.class);

     }

 

+    @NotNull

+    @Override

+    public Mono<ResourceDefinition> getResourceDefinition(@NotNull String resourceDefinitionName) throws BluePrintException{

+        Optional<ResourceDictionary> dbResourceDictionary = resourceDictionaryRepository.findByName(resourceDefinitionName);

+        if(dbResourceDictionary.isPresent()){

+            return Mono.just(dbResourceDictionary.get().getDefinition());

+        }else{

+            throw new BluePrintException(String.format("failed to get resource dictionary (%s) from repo", resourceDefinitionName));

+        }

+    }

+

     private <T> Mono<T> getModelType(String modelName, Class<T> valueClass) throws BluePrintException {

         Preconditions.checkArgument(StringUtils.isNotBlank(modelName),

                 "Failed to get model from repo, model name is missing");