Blueprints Processor Microservice

Implement Resource Resolution Processor Interface definitions.

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

12 files changed, 211 insertions, 195 deletions

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionComponent.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionComponent.kt
index ff1a01d5..a485fa62 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionComponent.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionComponent.kt
@@ -1,39 +1,32 @@
 /*

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

+ * 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

+ * 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

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

+ * 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.blueprintsprocessor.services.resolution

 

-import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ComponentNode

+import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ExecutionServiceInput

+import org.onap.ccsdk.apps.blueprintsprocessor.services.execution.AbstractComponentFunction

 import org.springframework.stereotype.Component

 

 @Component("component-resource-resolution")

-open class ResourceResolutionComponent : ComponentNode {

-    override fun validate(context: MutableMap<String, Any>, componentContext: MutableMap<String, Any?>) {

+open class ResourceResolutionComponent : AbstractComponentFunction() {

+    override fun process(executionRequest: ExecutionServiceInput) {

         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

     }

 

-    override fun process(context: MutableMap<String, Any>, componentContext: MutableMap<String, Any?>) {

-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

-    }

-

-    override fun errorHandle(context: MutableMap<String, Any>, componentContext: MutableMap<String, Any?>) {

-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

-    }

-

-    override fun reTrigger(context: MutableMap<String, Any>, componentContext: MutableMap<String, Any?>) {

+    override fun recover(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {

         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.

     }

 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionConstants.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionConstants.kt
new file mode 100644
index 00000000..e234d056
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionConstants.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.blueprintsprocessor.services.resolution
+
+class ResourceResolutionConstants {
+    companion object {
+        const val PREFIX_RESOURCE_ASSIGNMENT_PROCESSOR = "resource-assignment-processor-"
+
+    }
+
+}
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionService.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionService.kt
index 3ee7e41f..155b3b03 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionService.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionService.kt
@@ -20,10 +20,12 @@ package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution
 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionInput

 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionOutput

 import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.Status

-import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ResourceAssignmentProcessorFactory

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

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

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

 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.utils.BulkResourceSequencingUtils

+import org.springframework.beans.factory.annotation.Autowired

+import org.springframework.context.ApplicationContext

 import org.springframework.stereotype.Service

 

 /**

@@ -33,7 +35,11 @@ import org.springframework.stereotype.Service
  */

 

 @Service

-class ResourceResolutionService(private val resourceAssignmentProcessorFactory: ResourceAssignmentProcessorFactory) {

+class ResourceResolutionService {

+

+

+    @Autowired

+    private lateinit var applicationContext: ApplicationContext

 

     fun resolveResource(resourceResolutionInput: ResourceResolutionInput): ResourceResolutionOutput {

         val resourceResolutionOutput = ResourceResolutionOutput()

@@ -43,7 +49,7 @@ class ResourceResolutionService(private val resourceAssignmentProcessorFactory:
 

         val context = hashMapOf<String, Any>()

 

-        process(resourceResolutionOutput.resourceAssignments, context)

+        process(resourceResolutionOutput.resourceAssignments)

 

         val status = Status()

         status.code = 200

@@ -53,7 +59,13 @@ class ResourceResolutionService(private val resourceAssignmentProcessorFactory:
         return resourceResolutionOutput

     }

 

-    fun process(resourceAssignments: MutableList<ResourceAssignment>, context: MutableMap<String, Any>): Unit {

+    fun registeredResourceSources(): List<String> {

+        return applicationContext.getBeanNamesForType(ResourceAssignmentProcessor::class.java)

+                .filter { it.startsWith(ResourceResolutionConstants.PREFIX_RESOURCE_ASSIGNMENT_PROCESSOR) }

+                .map { it.substringAfter(ResourceResolutionConstants.PREFIX_RESOURCE_ASSIGNMENT_PROCESSOR) }

+    }

+

+    fun process(resourceAssignments: MutableList<ResourceAssignment>) {

 

         val bulkSequenced = BulkResourceSequencingUtils.process(resourceAssignments)

 

@@ -61,18 +73,18 @@ class ResourceResolutionService(private val resourceAssignmentProcessorFactory:
             batchResourceAssignments.filter { it.name != "*" && it.name != "start" }

                     .map { resourceAssignment ->

                         val dictionarySource = resourceAssignment.dictionarySource

-                        val processorInstanceName = "resource-assignment-processor-".plus(dictionarySource)

-                        val resourceAssignmentProcessor = resourceAssignmentProcessorFactory.getInstance(processorInstanceName)

+                        val processorInstanceName = ResourceResolutionConstants.PREFIX_RESOURCE_ASSIGNMENT_PROCESSOR.plus(dictionarySource)

+

+                        val resourceAssignmentProcessor = applicationContext.getBean(processorInstanceName) as? ResourceAssignmentProcessor

                                 ?: throw BluePrintProcessorException("failed to get resource processor for instance name($processorInstanceName) " +

                                         "for resource assignment(${resourceAssignment.name})")

                         try {

-                            resourceAssignmentProcessor.validate(resourceAssignment, context)

-                            resourceAssignmentProcessor.process(resourceAssignment, context)

-                        } catch (e: Exception) {

-                            resourceAssignmentProcessor.errorHandle(resourceAssignment, context)

+                            // Invoke Apply Method

+                            resourceAssignmentProcessor.apply(resourceAssignment)

+                        } catch (e: RuntimeException) {

+                            resourceAssignmentProcessor.recover(e, resourceAssignment)

                             throw BluePrintProcessorException(e)

                         }

-

                     }

         }

     }

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SdncResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DataBaseResourceAssignmentProcessor.kt
index 4b11f580..66e43f1b 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SdncResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DataBaseResourceAssignmentProcessor.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.
@@ -16,35 +17,21 @@
 
 package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor
 
-import com.att.eelf.configuration.EELFManager
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignmentProcessor
 import org.springframework.stereotype.Service
 
 /**
- * SdncResourceAssignmentProcessor
+ * DataBaseResourceAssignmentProcessor
  *
  * @author Brinda Santh
  */
 @Service("resource-assignment-processor-db")
-open class SdncResourceAssignmentProcessor : ResourceAssignmentProcessor {
+open class DataBaseResourceAssignmentProcessor : ResourceAssignmentProcessor(){
 
-    private val log = EELFManager.getInstance().getLogger(SdncResourceAssignmentProcessor::class.java)
-
-    override fun validate(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Validation Resource Assignments")
-    }
-
-    override fun process(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Processing Resource Assignments")
+    override fun process(executionRequest: ResourceAssignment) {
     }
 
-    override fun errorHandle(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("ErrorHandle Resource Assignments")
+    override fun recover(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {
     }
-
-    override fun reTrigger(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Re Trigger Resource Assignments")
-    }
-
 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DefaultResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DefaultResourceAssignmentProcessor.kt
index 9580ca49..e701e718 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DefaultResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DefaultResourceAssignmentProcessor.kt
@@ -17,7 +17,6 @@
 

 package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor

 

-import com.att.eelf.configuration.EELFManager

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

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

 import org.springframework.stereotype.Service

@@ -28,22 +27,11 @@ import org.springframework.stereotype.Service
  * @author Brinda Santh

  */

 @Service("resource-assignment-processor-default")

-open class DefaultResourceAssignmentProcessor : ResourceAssignmentProcessor {

-    private val log = EELFManager.getInstance().getLogger(DefaultResourceAssignmentProcessor::class.java)

+open class DefaultResourceAssignmentProcessor : ResourceAssignmentProcessor() {

 

-    override fun validate(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Validation Resource Assignments")

+    override fun process(executionRequest: ResourceAssignment) {

     }

 

-    override fun process(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Processing Resource Assignments")

-    }

-

-    override fun errorHandle(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("ErrorHandle Resource Assignments")

-    }

-

-    override fun reTrigger(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Re Trigger Resource Assignments")

+    override fun recover(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {

     }

 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/InputResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/InputResourceAssignmentProcessor.kt
index 05f7d5cd..9e177d46 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/InputResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/InputResourceAssignmentProcessor.kt
@@ -17,7 +17,6 @@
 

 package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor

 

-import com.att.eelf.configuration.EELFManager

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

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

 import org.springframework.stereotype.Service

@@ -28,22 +27,11 @@ import org.springframework.stereotype.Service
  * @author Brinda Santh

  */

 @Service("resource-assignment-processor-input")

-open class InputResourceAssignmentProcessor : ResourceAssignmentProcessor {

-    private val log = EELFManager.getInstance().getLogger(InputResourceAssignmentProcessor::class.java)

+open class InputResourceAssignmentProcessor : ResourceAssignmentProcessor() {

 

-    override fun validate(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Validation Resource Assignments")

+    override fun process(executionRequest: ResourceAssignment) {

     }

 

-    override fun process(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Processing Resource Assignments")

-    }

-

-    override fun errorHandle(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("ErrorHandle Resource Assignments")

-    }

-

-    override fun reTrigger(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {

-        log.info("Re Trigger Resource Assignments")

+    override fun recover(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {

     }

 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/MDSALResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SimpleRestResourceAssignmentProcessor.kt
index 9d54cd46..e1b9a8ef 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/MDSALResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SimpleRestResourceAssignmentProcessor.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.
@@ -16,33 +17,21 @@
 
 package org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor
 
-import com.att.eelf.configuration.EELFManager
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
 import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignmentProcessor
 import org.springframework.stereotype.Service
 
 /**
- * MDSALResourceAssignmentProcessor
+ * SimpleRestResourceAssignmentProcessor
  *
  * @author Brinda Santh
  */
 @Service("resource-assignment-processor-mdsal")
-open class MDSALResourceAssignmentProcessor : ResourceAssignmentProcessor {
-    private val log = EELFManager.getInstance().getLogger(MDSALResourceAssignmentProcessor::class.java)
+open class SimpleRestResourceAssignmentProcessor : ResourceAssignmentProcessor() {
 
-    override fun validate(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Validation Resource Assignments")
+    override fun process(executionRequest: ResourceAssignment) {
     }
 
-    override fun process(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Processing Resource Assignments")
-    }
-
-    override fun errorHandle(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("ErrorHandle Resource Assignments")
-    }
-
-    override fun reTrigger(resourceAssignment: ResourceAssignment, context: MutableMap<String, Any>) {
-        log.info("Re Trigger Resource Assignments")
+    override fun recover(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {
     }
 }
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java b/ms/blueprintsprocessor/functions/resource-resolution/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
deleted file mode 100644
index 0768c609..00000000
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/java/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*

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

- *  Modifications Copyright © 2018 IBM.

- *

- *  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.blueprintsprocessor.services.resolution;

-

-import com.fasterxml.jackson.databind.node.ObjectNode;

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

-import org.apache.commons.io.FileUtils;

-import org.junit.Assert;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionInput;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionOutput;

-import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ResourceAssignmentProcessorFactory;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.DefaultResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.InputResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.MDSALResourceAssignmentProcessor;

-import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.SdncResourceAssignmentProcessor;

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

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

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.test.context.ContextConfiguration;

-import org.springframework.test.context.junit4.SpringRunner;

-

-import java.io.File;

-import java.nio.charset.Charset;

-import java.util.List;

-

-/**

- * ResourceResolutionServiceTest

- *

- * @author Brinda Santh DATE : 8/15/2018

- */

-@RunWith(SpringRunner.class)

-@ContextConfiguration(classes = {ResourceResolutionService.class, ResourceAssignmentProcessorFactory.class,

-        InputResourceAssignmentProcessor.class, DefaultResourceAssignmentProcessor.class,

-        SdncResourceAssignmentProcessor.class, MDSALResourceAssignmentProcessor.class})

-public class ResourceResolutionServiceTest {

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

-

-    @Autowired

-    private ResourceResolutionService resourceResolutionService;

-

-    @Test

-    public void testResolveResource() throws Exception {

-

-        Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService);

-

-        String resourceResolutionInputContent = FileUtils.readFileToString(

-                new File("src/test/resources/payload/requests/sample-resourceresolution-request.json"), Charset.defaultCharset());

-

-        ResourceResolutionInput resourceResolutionInput = JacksonUtils.readValue(resourceResolutionInputContent, ResourceResolutionInput.class);

-        Assert.assertNotNull("failed to populate resourceResolutionInput request ", resourceResolutionInput);

-

-        String resourceAssignmentContent = FileUtils.readFileToString(

-                new File("src/test/resources/mapping/db/resource-assignments-simple.json"), Charset.defaultCharset());

-        List<ResourceAssignment> batchResourceAssignment =

-                JacksonUtils.getListFromJson(resourceAssignmentContent, ResourceAssignment.class);

-

-        Assert.assertTrue("failed to create ResourceAssignment from file", CollectionUtils.isNotEmpty(batchResourceAssignment));

-        resourceResolutionInput.setResourceAssignments(batchResourceAssignment);

-

-        ObjectNode inputContent = (ObjectNode) JacksonUtils.jsonNodeFromFile("src/test/resources/payload/inputs/input.json");

-        Assert.assertNotNull("failed to populate input payload ", inputContent);

-        resourceResolutionInput.setPayload(inputContent);

-        log.info("ResourceResolutionInput : {}", JacksonUtils.getJson(resourceResolutionInput, true));

-

-        ResourceResolutionOutput resourceResolutionOutput = resourceResolutionService.resolveResource(resourceResolutionInput);

-        Assert.assertNotNull("failed to populate output", resourceResolutionOutput);

-

-    }

-}

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.kt
new file mode 100644
index 00000000..a7d573c6
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/ResourceResolutionServiceTest.kt
@@ -0,0 +1,95 @@
+/*
+ * 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.blueprintsprocessor.services.resolution
+
+import com.fasterxml.jackson.databind.node.ObjectNode
+import org.apache.commons.collections.CollectionUtils
+import org.apache.commons.io.FileUtils
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ResourceResolutionInput
+import org.onap.ccsdk.apps.blueprintsprocessor.core.factory.ResourceAssignmentProcessorFactory
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.DataBaseResourceAssignmentProcessor
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.DefaultResourceAssignmentProcessor
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.InputResourceAssignmentProcessor
+import org.onap.ccsdk.apps.blueprintsprocessor.services.resolution.processor.SimpleRestResourceAssignmentProcessor
+import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
+import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment
+import org.slf4j.LoggerFactory
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.junit4.SpringRunner
+import java.io.File
+import java.nio.charset.Charset
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+/**
+ * ResourceResolutionServiceTest
+ *
+ * @author Brinda Santh DATE : 8/15/2018
+ */
+@RunWith(SpringRunner::class)
+@ContextConfiguration(classes = [ResourceResolutionService::class, ResourceAssignmentProcessorFactory::class,
+    InputResourceAssignmentProcessor::class, DefaultResourceAssignmentProcessor::class,
+    DataBaseResourceAssignmentProcessor::class, SimpleRestResourceAssignmentProcessor::class])
+class ResourceResolutionServiceTest {
+
+    private val log = LoggerFactory.getLogger(ResourceResolutionServiceTest::class.java)
+
+    @Autowired
+    lateinit var resourceResolutionService: ResourceResolutionService
+
+
+    @Test
+    fun testRegisteredSource() {
+        val sources = resourceResolutionService.registeredResourceSources()
+        assertNotNull(sources, "failed to get registered sources")
+        assertTrue(sources.containsAll(arrayListOf("input", "default", "db", "mdsal")), "failed to get registered sources")
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun testResolveResource() {
+
+        Assert.assertNotNull("failed to create ResourceResolutionService", resourceResolutionService)
+
+        val resourceResolutionInputContent = FileUtils.readFileToString(
+                File("src/test/resources/payload/requests/sample-resourceresolution-request.json"), Charset.defaultCharset())
+
+        val resourceResolutionInput = JacksonUtils.readValue(resourceResolutionInputContent, ResourceResolutionInput::class.java)
+        Assert.assertNotNull("failed to populate resourceResolutionInput request ", resourceResolutionInput)
+
+        val resourceAssignmentContent = FileUtils.readFileToString(
+                File("src/test/resources/mapping/db/resource-assignments-simple.json"), Charset.defaultCharset())
+        val batchResourceAssignment = JacksonUtils.getListFromJson(resourceAssignmentContent, ResourceAssignment::class.java)
+
+        Assert.assertTrue("failed to create ResourceAssignment from file", CollectionUtils.isNotEmpty(batchResourceAssignment))
+        resourceResolutionInput!!.resourceAssignments = batchResourceAssignment as MutableList<ResourceAssignment>
+
+        val inputContent = JacksonUtils.jsonNodeFromFile("src/test/resources/payload/inputs/input.json") as ObjectNode
+        Assert.assertNotNull("failed to populate input payload ", inputContent)
+        resourceResolutionInput.payload = inputContent
+        log.info("ResourceResolutionInput : {}", JacksonUtils.getJson(resourceResolutionInput, true))
+
+        val resourceResolutionOutput = resourceResolutionService.resolveResource(resourceResolutionInput)
+        Assert.assertNotNull("failed to populate output", resourceResolutionOutput)
+
+    }
+
+}
diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/logback-test.xml b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..a816a06c
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/logback-test.xml
@@ -0,0 +1,35 @@
+<!--

+  ~ 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.

+  -->

+

+<configuration>

+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

+        <!-- encoders are assigned the type

+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->

+        <encoder>

+            <pattern>%d{HH:mm:ss.SSS} %-5level %logger{100} - %msg%n</pattern>

+        </encoder>

+    </appender>

+

+

+    <logger name="org.springframework" level="warn"/>

+    <logger name="org.hibernate" level="info"/>

+    <logger name="org.onap.ccsdk.apps.blueprintsprocessor" level="info"/>

+

+    <root level="warn">

+        <appender-ref ref="STDOUT"/>

+    </root>

+

+</configuration>

diff --git a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
index 0e70e490..9a0d1f91 100644
--- a/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
+++ b/ms/blueprintsprocessor/modules/services/execution-service/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/execution/AbstractComponentFunction.kt
@@ -34,14 +34,6 @@ abstract class AbstractComponentFunction : BlueprintFunctionNode<ExecutionServic
         return executionRequest

     }

 

-    override fun process(executionRequest: ExecutionServiceInput) {

-        log.info("Processing...")

-    }

-

-    override fun recover(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {

-        log.info("Recovering...")

-    }

-

     override fun prepareResponse(): ExecutionServiceOutput {

         log.info("Preparing Response...")

         return ExecutionServiceOutput()

diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/mock/MockComponentFunction.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/mock/MockComponentFunction.kt
index 5787721c..5aa90130 100644
--- a/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/mock/MockComponentFunction.kt
+++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/mock/MockComponentFunction.kt
@@ -37,10 +37,10 @@ class MockComponentFunction : AbstractComponentFunction() {
     private val log = LoggerFactory.getLogger(ComponentExecuteNodeExecutor::class.java)
 
     override fun process(executionRequest: ExecutionServiceInput) {
-        super.process(executionRequest)
+        log.info("Processing component..")
     }
 
     override fun recover(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
-        super.recover(runtimeException, executionRequest)
+        log.info("Recovering component..")
     }
 }
\ No newline at end of file