Controller Blueprints Microservice

Add dynamic resource source mapping rest service.

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

14 files changed, 181 insertions, 13 deletions

diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
index ff260871..d141ed0c 100644
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -1,5 +1,6 @@
 /*
  *  Copyright © 2018 IBM.
+ *  Modifications Copyright © 2017-2018 AT&T Intellectual Property.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -92,3 +93,8 @@ open class ResourceAssignment {
  * Default Source, Database Source, Rest Sources, etc)
  */
 interface ResourceSource : Serializable
+
+
+open class ResourceSourceMapping {
+    lateinit var resourceSourceMappings: MutableMap<String, String>
+}
diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
new file mode 100644
index 00000000..2911ab26
--- /dev/null
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactory.kt
@@ -0,0 +1,47 @@
+/*

+ *  Copyright © 2017-2018 AT&T Intellectual Property.

+ *

+ *  Licensed under the Apache License, Version 2.0 (the "License");

+ *  you may not use this file except in compliance with the License.

+ *  You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ *  Unless required by applicable law or agreed to in writing, software

+ *  distributed under the License is distributed on an "AS IS" BASIS,

+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ *  See the License for the specific language governing permissions and

+ *  limitations under the License.

+ */

+

+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory

+

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

+import org.onap.ccsdk.apps.controllerblueprints.core.format

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceSourceMapping

+

+/**

+ * ResourceSourceMappingFactory.

+ *

+ * @author Brinda Santh

+ */

+object ResourceSourceMappingFactory {

+

+    private val resourceSourceMappings: MutableMap<String, String> = hashMapOf()

+

+    fun registerSourceMapping(sourceInstance: String, nodeTypeName: String) {

+        resourceSourceMappings[sourceInstance] = nodeTypeName

+    }

+

+    fun getRegisterSourceMapping(sourceInstance: String): String {

+        return resourceSourceMappings[sourceInstance]

+                ?: throw BluePrintException(format("failed to get source({}) mapping", sourceInstance))

+    }

+

+    fun getRegisterSourceMapping(): ResourceSourceMapping {

+        val resourceSourceMapping = ResourceSourceMapping()

+        resourceSourceMapping.resourceSourceMappings = resourceSourceMappings

+        return resourceSourceMapping

+    }

+}

+

diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
new file mode 100644
index 00000000..b67aa799
--- /dev/null
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -0,0 +1,42 @@
+/*

+ *  Copyright © 2017-2018 AT&T Intellectual Property.

+ *

+ *  Licensed under the Apache License, Version 2.0 (the "License");

+ *  you may not use this file except in compliance with the License.

+ *  You may obtain a copy of the License at

+ *

+ *      http://www.apache.org/licenses/LICENSE-2.0

+ *

+ *  Unless required by applicable law or agreed to in writing, software

+ *  distributed under the License is distributed on an "AS IS" BASIS,

+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ *  See the License for the specific language governing permissions and

+ *  limitations under the License.

+ */

+

+package org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory;

+

+import org.junit.Test;

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

+import org.springframework.util.Assert;

+

+public class ResourceSourceMappingFactoryTest {

+

+    @Test

+    public void testRegisterResourceMapping() {

+

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("db", "source-db");

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("mdsal", "source-rest");

+

+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("db");

+        Assert.notNull(nodeTypeName, "Failed to get db mapping");

+

+        ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();

+        Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");

+        Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");

+

+    }

+

+}

diff --git a/ms/controllerblueprints/application/load/resource_dictionary/default-source.json b/ms/controllerblueprints/application/load/resource_dictionary/default-source.json
new file mode 100644
index 00000000..64bfa0cc
--- /dev/null
+++ b/ms/controllerblueprints/application/load/resource_dictionary/default-source.json
@@ -0,0 +1,16 @@
+{

+  "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",

+  "name": "default-source",

+  "property" :{

+    "description": "name of the ",

+    "type": "string"

+  },

+  "updated-by": "brindasanth@onap.com",

+  "sources": {

+    "default": {

+      "type": "source-default",

+      "properties": {

+      }

+    }

+  }

+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/opt/app/onap/config/application.properties b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
index b65d5bfe..d2814827 100644
--- a/ms/controllerblueprints/application/opt/app/onap/config/application.properties
+++ b/ms/controllerblueprints/application/opt/app/onap/config/application.properties
@@ -53,4 +53,7 @@ load.dataTypePath=load/model_type/data_type
 load.nodeTypePath=load/model_type/node_type
 load.artifactTypePath=load/model_type/artifact_type
 load.resourceDictionaryPath=load/resource_dictionary
-load.blueprintsPath=load/blueprints
\ No newline at end of file
+load.blueprintsPath=load/blueprints
+
+# Load Resource Source Mappings
+resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/src/test/resources/application.properties b/ms/controllerblueprints/application/src/test/resources/application.properties
index 3bcbbd9c..e2d040c2 100644
--- a/ms/controllerblueprints/application/src/test/resources/application.properties
+++ b/ms/controllerblueprints/application/src/test/resources/application.properties
@@ -33,4 +33,7 @@ load.dataTypePath=load/model_type/data_type
 load.nodeTypePath=load/model_type/node_type

 load.artifactTypePath=load/model_type/artifact_type

 load.resourceDictionaryPath=load/resource_dictionary

-load.blueprintsPath=load/blueprints
\ No newline at end of file
+load.blueprintsPath=load/blueprints

+

+# Load Resource Source Mappings

+resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java
index 5a4a2877..fc7410f9 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java
@@ -17,20 +17,40 @@
 

 package org.onap.ccsdk.apps.controllerblueprints.service;

 

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

+import org.apache.commons.collections.CollectionUtils;

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory;

+import org.springframework.beans.factory.annotation.Value;

 import org.springframework.stereotype.Component;

 

 import javax.annotation.PostConstruct;

+import java.util.List;

 

 @Component

 @SuppressWarnings("unused")

 public class ApplicationRegistrationService {

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

+

+    @Value("#{'${resourceSourceMappings}'.split(',')}")

+    private List<String> resourceSourceMappings;

 

     @PostConstruct

-    public void register(){

+    public void register() {

         registerDictionarySources();

     }

 

-    public void registerDictionarySources(){

-

+    public void registerDictionarySources() {

+        log.info("Registering Dictionary Sources : {}", resourceSourceMappings);

+        if (CollectionUtils.isNotEmpty(resourceSourceMappings)) {

+            resourceSourceMappings.forEach(resourceSourceMapping -> {

+                String[] mappingKeyValue = resourceSourceMapping.split("=");

+                if (mappingKeyValue != null && mappingKeyValue.length == 2) {

+                    ResourceSourceMappingFactory.INSTANCE.registerSourceMapping(mappingKeyValue[0].trim(), mappingKeyValue[1].trim());

+                } else {

+                    log.warn("failed to get resource source mapping {}", resourceSourceMapping);

+                }

+            });

+        }

     }

 }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
index 62aa0e29..fd73db3b 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ResourceDictionaryService.java
@@ -22,8 +22,9 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

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

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

-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.ResourceSourceMapping;

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory;

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

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

 import org.onap.ccsdk.apps.controllerblueprints.service.validator.ResourceDictionaryValidator;

@@ -105,7 +106,7 @@ public class ResourceDictionaryService {
      */

     public ResourceDictionary saveResourceDictionary(ResourceDictionary resourceDictionary) {

         Preconditions.checkNotNull(resourceDictionary, "Resource Dictionary information is missing");

-        Preconditions.checkNotNull(resourceDictionary.getDefinition(),"Resource Dictionary definition information is missing");

+        Preconditions.checkNotNull(resourceDictionary.getDefinition(), "Resource Dictionary definition information is missing");

 

         ResourceDefinition resourceDefinition = resourceDictionary.getDefinition();

         Preconditions.checkNotNull(resourceDefinition, "failed to get resource definition from content");

@@ -153,4 +154,12 @@ public class ResourceDictionaryService {
         Preconditions.checkArgument(StringUtils.isNotBlank(name), "Resource dictionary Name Information is missing.");

         resourceDictionaryRepository.deleteByName(name);

     }

+

+    /**

+     * This is a getResourceSourceMapping service

+     *

+     */

+    public ResourceSourceMapping getResourceSourceMapping() {

+        return ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();

+    }

 }

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
index e0cf6c69..287d413c 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRest.java
@@ -18,6 +18,7 @@
 package org.onap.ccsdk.apps.controllerblueprints.service.rs;

 

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

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

 import org.onap.ccsdk.apps.controllerblueprints.service.ResourceDictionaryService;

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

 import org.springframework.http.MediaType;

@@ -76,4 +77,10 @@ public class ResourceDictionaryRest {
 

     }

 

+    @GetMapping(path = "/source-mapping", produces = MediaType.APPLICATION_JSON_VALUE)

+    public @ResponseBody

+    ResourceSourceMapping getResourceSourceMapping() {

+        return resourceDictionaryService.getResourceSourceMapping();

+    }

+

 }

diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerService.kt
index c5a78a9c..0d08985a 100644
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerService.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerService.kt
@@ -14,7 +14,7 @@
  *  limitations under the License.

  */

 

-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.service

+package org.onap.ccsdk.apps.controllerblueprints.service.enhancer

 

 import com.att.eelf.configuration.EELFLogger

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

@@ -24,6 +24,8 @@ import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintEnhancerSe
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment

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

 import com.att.eelf.configuration.EELFManager

+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.service.ResourceAssignmentValidationDefaultService

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

 

 /**

  * ResourceAssignmentEnhancerService.

@@ -81,6 +83,6 @@ open class ResourceAssignmentEnhancerDefaultService(private val resourceDefiniti
     }

 

     private fun getResourceDefinition(name: String): ResourceDefinition {

-        return resourceDefinitionRepoService.getResourceDefinition(name)!!.block()!!

+        return resourceDefinitionRepoService.getResourceDefinition(name).block()!!

     }

 }
\ No newline at end of file
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java
index 57c8509d..7d16f50f 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/enhancer/ResourceAssignmentEnhancerServiceTest.java
@@ -14,7 +14,7 @@
  *  limitations under the License.

  */

 

-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.service;

+package org.onap.ccsdk.apps.controllerblueprints.service.enhancer;

 

 import org.junit.Assert;

 import org.junit.Test;

@@ -22,6 +22,8 @@ import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;
 import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate;

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

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

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

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

 

 import java.util.List;

 

@@ -36,9 +38,9 @@ public class ResourceAssignmentEnhancerServiceTest {
     public void testEnhanceBluePrint() throws BluePrintException {

 

         List<ResourceAssignment> resourceAssignments = JacksonReactorUtils

-                .getListFromClassPathFile("enrich/simple-enrich.json", ResourceAssignment.class).block();

+                .getListFromClassPathFile("enhance/simple-enrich.json", ResourceAssignment.class).block();

         Assert.assertNotNull("Failed to get Resource Assignment", resourceAssignments);

-        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("load");

+        ResourceDefinitionRepoService resourceDefinitionRepoService = new ResourceDefinitionFileRepoService("./../../application/load");

         ResourceAssignmentEnhancerService resourceAssignmentEnhancerService =

                 new ResourceAssignmentEnhancerDefaultService(resourceDefinitionRepoService);

         ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments);

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
index 5955ae19..ac786d0e 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
@@ -26,6 +26,7 @@ import org.junit.runners.MethodSorters;
 import org.onap.ccsdk.apps.controllerblueprints.TestApplication;

 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.ResourceSourceMapping;

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

 import com.att.eelf.configuration.EELFLogger;

 import com.att.eelf.configuration.EELFManager;

@@ -103,4 +104,11 @@ public class ResourceDictionaryRestTest {
 

     }

 

+    @Test

+    public void test03GetResourceSourceMapping() {

+        ResourceSourceMapping resourceSourceMapping = resourceDictionaryRest.getResourceSourceMapping();

+        org.springframework.util.Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");

+        org.springframework.util.Assert.notNull(resourceSourceMapping.getResourceSourceMappings(), "Failed to get resource source mappings");

+    }

+

 }

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 429588b3..3a913b70 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -28,4 +28,7 @@ load.dataTypePath=./../../application/load/model_type/data_type
 load.nodeTypePath=./../../application/load/model_type/node_type
 load.artifactTypePath=./../../application/load/model_type/artifact_type
 load.resourceDictionaryPath=./../../application/load/resource_dictionary
-load.blueprintsPath=./../../application/load/blueprints
\ No newline at end of file
+load.blueprintsPath=./../../application/load/blueprints
+
+# Load Resource Source Mappings
+resourceSourceMappings=db=source-db,input=source-input,default=source-default,mdsal=source-rest
\ No newline at end of file
diff --git a/components/resource-dict/src/test/resources/enrich/simple-enrich.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/simple-enrich.json
index 641da80a..641da80a 100644
--- a/components/resource-dict/src/test/resources/enrich/simple-enrich.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/simple-enrich.json