Implement Resource Resolution Services

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

4 files changed, 54 insertions, 37 deletions

diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
index 3cad62711..b0483dc3f 100644
--- a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
+++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
@@ -20,7 +20,6 @@ package org.onap.ccsdk.apps.blueprintsprocessor.core.api.data
 import com.fasterxml.jackson.annotation.JsonFormat

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

 import io.swagger.annotations.ApiModelProperty

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

 import java.util.*

 

 /**

@@ -29,28 +28,6 @@ import java.util.*
  * DATE : 8/15/2018

  */

 

-open class ResourceResolutionInput {

-    @get:ApiModelProperty(required = true)

-    lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required = true)

-    lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required = true)

-    lateinit var resourceAssignments: MutableList<ResourceAssignment>

-    @get:ApiModelProperty(required = true)

-    lateinit var payload: ObjectNode

-}

-

-open class ResourceResolutionOutput {

-    @get:ApiModelProperty(required = true)

-    lateinit var commonHeader: CommonHeader

-    @get:ApiModelProperty(required = true)

-    lateinit var actionIdentifiers: ActionIdentifiers

-    @get:ApiModelProperty(required = true)

-    lateinit var status: Status

-    @get:ApiModelProperty(required = true)

-    lateinit var resourceAssignments: MutableList<ResourceAssignment>

-}

-

 open class ExecutionServiceInput {

     @get:ApiModelProperty(required = true)

     lateinit var commonHeader: CommonHeader

diff --git a/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/utils/PayloadUtils.kt b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/utils/PayloadUtils.kt
new file mode 100644
index 000000000..31dca33b8
--- /dev/null
+++ b/ms/blueprintsprocessor/modules/commons/core/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/core/utils/PayloadUtils.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.blueprintsprocessor.core.utils
+
+import com.fasterxml.jackson.databind.JsonNode
+import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants
+import org.onap.ccsdk.apps.controllerblueprints.core.service.BluePrintRuntimeService
+
+
+class PayloadUtils {
+
+    companion object {
+
+        fun prepareInputsFromWorkflowPayload(bluePrintRuntimeService: BluePrintRuntimeService<*>, payload: JsonNode, workflowName: String) {
+            val input = payload.get("$workflowName-request")
+            bluePrintRuntimeService.assignWorkflowInputs(workflowName, input)
+        }
+
+        fun prepareDynamicInputsFromWorkflowPayload(bluePrintRuntimeService: BluePrintRuntimeService<*>, payload: JsonNode, workflowName: String) {
+            val input = payload.get("$workflowName-request")
+            val propertyFields = input.get("$workflowName-properties")
+            prepareDynamicInputsFromComponentPayload(bluePrintRuntimeService, propertyFields)
+        }
+
+        fun prepareDynamicInputsFromComponentPayload(bluePrintRuntimeService: BluePrintRuntimeService<*>, payload: JsonNode) {
+            payload.fields().forEach { property ->
+                val path = StringBuilder(BluePrintConstants.PATH_INPUTS)
+                        .append(BluePrintConstants.PATH_DIVIDER).append(property.key).toString()
+                bluePrintRuntimeService.put(path, property.value)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/resource/api/ResourceResolutionController.java b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/resource/api/ResourceResolutionController.java
index 0f3b4a821..fb833a573 100644
--- a/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/resource/api/ResourceResolutionController.java
+++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/src/main/java/org/onap/ccsdk/apps/blueprintsprocessor/resource/api/ResourceResolutionController.java
@@ -16,12 +16,12 @@
 

 package org.onap.ccsdk.apps.blueprintsprocessor.resource.api;

 

-import io.swagger.annotations.ApiOperation;

-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.functions.resource.resolution.ResourceResolutionService;

 import org.springframework.http.MediaType;

-import org.springframework.web.bind.annotation.*;

+import org.springframework.web.bind.annotation.RequestMapping;

+import org.springframework.web.bind.annotation.RequestMethod;

+import org.springframework.web.bind.annotation.ResponseBody;

+import org.springframework.web.bind.annotation.RestController;

 import reactor.core.publisher.Mono;

 

 /**

@@ -45,12 +45,4 @@ public class ResourceResolutionController {
     Mono<String> ping() {

         return Mono.just("Success");

     }

-

-    @RequestMapping(path = "/resolve-mapping", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)

-    @ApiOperation(value = "Resolve Resource Mappings",

-            notes = "Also returns a link to retrieve all students with rel - all-students")

-    public @ResponseBody

-    Mono<ResourceResolutionOutput> resolveResource(@RequestBody ResourceResolutionInput resourceResolutionInput) {

-        return Mono.just(resourceResolutionService.resolveResource(resourceResolutionInput));

-    }

 }

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 c6ce46570..87a925f9a 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
@@ -19,11 +19,11 @@ package org.onap.ccsdk.apps.blueprintsprocessor.services.execution
 

 import com.fasterxml.jackson.databind.JsonNode

 import com.fasterxml.jackson.databind.node.JsonNodeFactory

-import com.fasterxml.jackson.databind.node.NullNode

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

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

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

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

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

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

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

 import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode

@@ -118,6 +118,7 @@ abstract class AbstractComponentFunction : BlueprintFunctionNode<ExecutionServic
     }

 

     fun getOperationInput(key: String): JsonNode {

-        return operationInputs[key] ?: NullNode.instance

+        return operationInputs[key]

+                ?: throw BluePrintProcessorException("couldn't get the operation input($key) value.")

     }

 }
\ No newline at end of file