Controller Blueprints Microservice

Add resource assignment enhancer, resource definition repo functions and code improvements.

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

6 files changed, 132 insertions, 9 deletions

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
index 3e68d0991..fde800057 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinitionTest.java
@@ -20,12 +20,12 @@ package org.onap.ccsdk.apps.controllerblueprints.resource.dict;
 import org.junit.Assert;

 import org.junit.Test;

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

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

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

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

 

 public class ResourceDefinitionTest {

-    private Logger log = LoggerFactory.getLogger(ResourceDefinitionTest.class);

-    String basePath = "load/resource_dictionary";

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

+    private String basePath = "load/resource_dictionary";

 

     @Test

     public void testDictionaryDefinitionInputSource(){

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java
new file mode 100644
index 000000000..57c8509d1
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentEnhancerServiceTest.java
@@ -0,0 +1,48 @@
+/*

+ *  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.service;

+

+import org.junit.Assert;

+import org.junit.Test;

+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 java.util.List;

+

+/**

+ * ResourceAssignmentEnhancerService.

+ *

+ * @author Brinda Santh

+ */

+public class ResourceAssignmentEnhancerServiceTest {

+

+    @Test

+    public void testEnhanceBluePrint() throws BluePrintException {

+

+        List<ResourceAssignment> resourceAssignments = JacksonReactorUtils

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

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

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

+        ResourceAssignmentEnhancerService resourceAssignmentEnhancerService =

+                new ResourceAssignmentEnhancerDefaultService(resourceDefinitionRepoService);

+        ServiceTemplate serviceTemplate = resourceAssignmentEnhancerService.enhanceBluePrint(resourceAssignments);

+        Assert.assertNotNull("Failed to get Enriched service Template", serviceTemplate);

+    }

+}

+

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
index 4d8301f4e..6216d5bf0 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceAssignmentValidationServiceTest.kt
@@ -16,19 +16,20 @@
 

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

 

+import com.att.eelf.configuration.EELFLogger

 import org.junit.Assert

 import org.junit.Test

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

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

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

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFManager

 /**

  * ResourceAssignmentValidationServiceTest.

  *

  * @author Brinda Santh

  */

 class ResourceAssignmentValidationServiceTest {

-    private val log = LoggerFactory.getLogger(ResourceAssignmentValidationServiceTest::class.java)

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(ResourceAssignmentValidationServiceTest::class.java)

     @Test

     fun testValidateSuccess() {

         log.info("**************** testValidateSuccess *****************")

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
new file mode 100644
index 000000000..1772277df
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/service/ResourceDefinitionRepoServiceTest.java
@@ -0,0 +1,36 @@
+/*

+ *  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.service;

+

+import org.junit.Assert;

+import org.junit.Test;

+import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeType;

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

+

+public class ResourceDefinitionRepoServiceTest {

+

+    @Test

+    public void testGetResourceDefinition() throws Exception{

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

+        ResourceDefinition resourceDefinition = resourceDefinitionRepoService

+                .getResourceDefinition("db-source").block();

+        Assert.assertNotNull("Failed to get Resource Definition db-source", resourceDefinition);

+

+        NodeType nodeType = resourceDefinitionRepoService.getNodeType("source-db").block();

+        Assert.assertNotNull("Failed to get Node Type source-db", resourceDefinition);

+    }

+}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
index 5ee561713..13bf8195e 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
@@ -27,8 +27,8 @@ import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment;

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

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

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

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

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

 

 import java.util.HashMap;

 import java.util.Map;

@@ -38,12 +38,13 @@ import java.util.Map;
  * @author Brinda Santh

  */

 public class ResourceDictionaryUtilsTest {

-    private static final Logger log = LoggerFactory.getLogger(ResourceDictionaryUtilsTest.class);

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

 

     @Test

     public void testPopulateSourceMapping() {

 

         ResourceAssignment resourceAssignment = new ResourceAssignment();

+        resourceAssignment.setName("sample-assignment");

         ResourceDefinition resourceDefinition = new ResourceDefinition();

         Map<String, NodeTemplate> sources = new HashMap<>();

         resourceDefinition.setSources(sources);

diff --git a/ms/controllerblueprints/modules/resource-dict/src/test/resources/enrich/simple-enrich.json b/ms/controllerblueprints/modules/resource-dict/src/test/resources/enrich/simple-enrich.json
new file mode 100644
index 000000000..641da80a2
--- /dev/null
+++ b/ms/controllerblueprints/modules/resource-dict/src/test/resources/enrich/simple-enrich.json
@@ -0,0 +1,37 @@
+[

+  {

+    "name": "rs-db-source",

+    "input-param": true,

+    "property": {

+      "type": "string",

+      "required": true

+    },

+    "dictionary-name": "db-source",

+    "dictionary-source": "db",

+    "dependencies": [

+      "input-source"

+    ]

+  },

+  {

+    "name": "ra-default-source",

+    "input-param": true,

+    "property": {

+      "type": "string",

+      "required": true

+    },

+    "dictionary-name": "default-source",

+    "dictionary-source": "default",

+    "dependencies": []

+  },

+  {

+    "name": "ra-input-source",

+    "input-param": true,

+    "property": {

+      "type": "string",

+      "required": true

+    },

+    "dictionary-name": "input-source",

+    "dictionary-source": "input",

+    "dependencies": []

+  }

+]