Controller Blueprints Microservice

Add Attribute function implementation for Operation output properties.

Change-Id: I8fd116ad7def07d208f9c3c1bfe7b75deae667d4
Issue-ID: CCSDK-524
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

4 files changed, 172 insertions, 77 deletions

diff --git a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
index 9c70d6ea..bc10f767 100644
--- a/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/core/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json
@@ -66,8 +66,8 @@
                   }

                 },

                 "outputs": {

-                  "resource-assignment-params": "success",

-                  "status": "status"

+                  "resource-assignment-params": { "get_attribute" : ["SELF", "params"] },

+                  "status": "Success"

                 }

               }

             }

diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
index ce0bceee..1fdb6c3c 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeService.kt
@@ -29,6 +29,9 @@ import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils

 import com.att.eelf.configuration.EELFLogger

 import com.att.eelf.configuration.EELFManager

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

+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper

+

 /**

  *

  *

@@ -78,8 +81,8 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
     }

 

     open fun resolveNodeTemplateInterfaceOperationInputs(nodeTemplateName: String,

-                                                    interfaceName: String, operationName: String): MutableMap<String, Any?> {

-        log.info("nodeTemplateInterfaceOperationInputsResolvedExpression for node template ({}),interface name ({}), " +

+                                                         interfaceName: String, operationName: String): MutableMap<String, Any?> {

+        log.info("resolveNodeTemplateInterfaceOperationInputs for node template ({}),interface name ({}), " +

                 "operationName({})", nodeTemplateName, interfaceName, operationName)

 

         val propertyAssignmentValue: MutableMap<String, Any?> = hashMapOf()

@@ -117,17 +120,25 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
             // Set for Return of method

             propertyAssignmentValue[nodeTypePropertyName] = resolvedValue

         }

-        log.info("resolved input assignments for node template ({}), values ({})", nodeTemplateName, propertyAssignmentValue)

+        log.trace("resolved input assignments for node template ({}), values ({})", nodeTemplateName,

+                propertyAssignmentValue)

 

         return propertyAssignmentValue

     }

 

 

     open fun resolveNodeTemplateInterfaceOperationOutputs(nodeTemplateName: String,

-                                                     interfaceName: String, operationName: String, componentContext: MutableMap<String, Any?>) {

-        log.info("nodeTemplateInterfaceOperationInputsResolvedExpression for node template ({}),interface name ({}), " +

+                                                          interfaceName: String, operationName: String): MutableMap<String, Any?>  {

+        log.info("resolveNodeTemplateInterfaceOperationOutputs for node template ({}),interface name ({}), " +

                 "operationName({})", nodeTemplateName, interfaceName, operationName)

 

+        val propertyAssignmentValue: MutableMap<String, Any?> = hashMapOf()

+

+        val propertyAssignments: MutableMap<String, Any> =

+                bluePrintContext.nodeTemplateInterfaceOperationOutputs(nodeTemplateName, interfaceName, operationName) as? MutableMap<String, Any>

+                        ?: throw BluePrintException(String.format("failed to get output definitions for node template (%s), " +

+                                "interface name (%s), operationName(%s)", nodeTemplateName, interfaceName, operationName))

+

         val nodeTypeName = bluePrintContext.nodeTemplateByName(nodeTemplateName).type

 

         val nodeTypeInterfaceOperationOutputs: MutableMap<String, PropertyDefinition> =

@@ -138,21 +149,32 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
         // Iterate Node Type Properties

         nodeTypeInterfaceOperationOutputs.forEach { nodeTypePropertyName, nodeTypeProperty ->

 

-            val operationOutputPropertyName: String = StringBuilder().append(nodeTemplateName)

-                    .append(".").append(interfaceName)

-                    .append(".").append(operationName)

-                    .append(".").append(nodeTypePropertyName).toString()

-            // Get the Value from component context

-            val resolvedValue: JsonNode = componentContext[operationOutputPropertyName] as? JsonNode

-                    ?: NullNode.getInstance()

+            // Get the Express or Value for the Node Template

+            val propertyAssignment: Any? = propertyAssignments[nodeTypePropertyName]

+

+            var resolvedValue: JsonNode = NullNode.getInstance()

+            if (propertyAssignment != null) {

+                // Resolve the Expressing

+                val propertyAssignmentExpression = PropertyAssignmentService(context, this)

+                resolvedValue = propertyAssignmentExpression.resolveAssignmentExpression(nodeTemplateName, nodeTypePropertyName, propertyAssignment)

+            } else {

+                // Assign default value to the Operation

+                nodeTypeProperty.defaultValue?.let {

+                    resolvedValue = JacksonUtils.jsonNodeFromObject(nodeTypeProperty.defaultValue!!)

+                }

+            }

+            // Set for Return of method

+            propertyAssignmentValue[nodeTypePropertyName] = resolvedValue

+

             // Store  operation output values into context

-            setNodeTemplateOperationPropertyValue(nodeTemplateName, interfaceName, operationName, nodeTypePropertyName, resolvedValue)

-            log.debug("resolved output assignments for node template ({}), property name ({}), value ({})", nodeTemplateName, nodeTypePropertyName, resolvedValue)

+            setNodeTemplateOperationOutputValue(nodeTemplateName, interfaceName, operationName, nodeTypePropertyName, resolvedValue)

+            log.trace("resolved output assignments for node template ({}), property name ({}), value ({})", nodeTemplateName, nodeTypePropertyName, resolvedValue)

         }

+        return propertyAssignmentValue

     }

 

     open fun resolveNodeTemplateArtifact(nodeTemplateName: String,

-                                    artifactName: String): String {

+                                         artifactName: String): String {

         val nodeTemplate = bluePrintContext.nodeTemplateByName(nodeTemplateName)

 

         val artifactDefinition: ArtifactDefinition = nodeTemplate.artifacts?.get(artifactName)

@@ -186,8 +208,16 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
         context[path] = value

     }

 

+    open fun setNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String, value: JsonNode) {

+

+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)

+                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()

+        context[path] = value

+    }

+

     open fun setNodeTemplateOperationPropertyValue(nodeTemplateName: String, interfaceName: String, operationName: String, propertyName: String,

-                                              value: JsonNode) {

+                                                   value: JsonNode) {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(BluePrintConstants.PATH_DIVIDER).append(operationName)

@@ -198,10 +228,10 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
     }

 

     open fun setNodeTemplateOperationInputValue(nodeTemplateName: String, interfaceName: String, operationName: String, propertyName: String,

-                                           value: JsonNode) {

+                                                value: JsonNode) {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(interfaceName)

-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(operationName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(BluePrintConstants.PATH_DIVIDER).append(operationName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INPUTS)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

                 .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()

@@ -209,10 +239,10 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
     }

 

     open fun setNodeTemplateOperationOutputValue(nodeTemplateName: String, interfaceName: String, operationName: String, propertyName: String,

-                                            value: JsonNode) {

+                                                 value: JsonNode) {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(interfaceName)

-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(operationName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(BluePrintConstants.PATH_DIVIDER).append(operationName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

                 .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()

@@ -230,19 +260,27 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_INTERFACES).append(BluePrintConstants.PATH_DIVIDER).append(interfaceName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OPERATIONS).append(BluePrintConstants.PATH_DIVIDER).append(operationName)

-                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_OUTPUTS).append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

                 .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()

         return context[path] as JsonNode

     }

 

-    open fun getPropertyValue(nodeTemplateName: String, propertyName: String): JsonNode? {

+    open fun getNodeTemplatePropertyValue(nodeTemplateName: String, propertyName: String): JsonNode? {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

                 .append(BluePrintConstants.PATH_DIVIDER).append(propertyName).toString()

         return context[path] as JsonNode

     }

 

-    open fun getRequirementPropertyValue(nodeTemplateName: String, requirementName: String, propertyName: String): JsonNode? {

+    open fun getNodeTemplateAttributeValue(nodeTemplateName: String, attributeName: String): JsonNode? {

+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)

+                .append(BluePrintConstants.PATH_DIVIDER).append(attributeName).toString()

+        return context[path] as JsonNode

+    }

+

+    open fun getNodeTemplateRequirementPropertyValue(nodeTemplateName: String, requirementName: String, propertyName:

+    String): JsonNode? {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_REQUIREMENTS).append(requirementName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

@@ -250,7 +288,8 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
         return context[path] as JsonNode

     }

 

-    open fun getCapabilityPropertyValue(nodeTemplateName: String, capabilityName: String, propertyName: String): JsonNode? {

+    open fun getNodeTemplateCapabilityPropertyValue(nodeTemplateName: String, capabilityName: String, propertyName:

+    String): JsonNode? {

         val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_CAPABILITIES).append(capabilityName)

                 .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_PROPERTIES)

@@ -275,4 +314,24 @@ open class BluePrintRuntimeService(var bluePrintContext: BluePrintContext, var c
             setWorkflowInputValue(workflowName, propertyName, valueNode)

         }

     }

+

+    open fun getJsonForNodeTemplateAttributeProperties(nodeTemplateName: String, keys: List<String>): JsonNode {

+

+        val jsonNode: ObjectNode = jacksonObjectMapper().createObjectNode()

+        val path: String = StringBuilder(BluePrintConstants.PATH_NODE_TEMPLATES).append(BluePrintConstants.PATH_DIVIDER).append(nodeTemplateName)

+                .append(BluePrintConstants.PATH_DIVIDER).append(BluePrintConstants.PATH_ATTRIBUTES)

+                .append(BluePrintConstants.PATH_DIVIDER).toString()

+        context.keys.filter {

+            it.startsWith(path)

+        }.map {

+            val key = it.replace(path, "")

+            if (keys.contains(key)) {

+                val value = context[it] as JsonNode

+                jsonNode.set(key, value)

+            }

+        }

+        return jsonNode

+    }

+

+

 }
\ No newline at end of file
diff --git a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
index ece09d6e..131bb30a 100644
--- a/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
+++ b/components/core/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/PropertyAssignmentService.kt
@@ -20,6 +20,7 @@ package org.onap.ccsdk.apps.controllerblueprints.core.service
 

 import com.fasterxml.jackson.databind.JsonNode

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

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

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

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

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

@@ -27,6 +28,7 @@ import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.ResourceResolverUtils

 import com.att.eelf.configuration.EELFLogger

 import com.att.eelf.configuration.EELFManager

+

 /**

  *

  *

@@ -42,11 +44,11 @@ class PropertyAssignmentService(var context: MutableMap<String, Any>,
 

 If Property Assignment is Expression.

     Get the Expression

-    Recurssely resolve the expression

+    Recursively resolve the expression

  */

 

     fun resolveAssignmentExpression(nodeTemplateName: String, assignmentName: String,

-                                            assignment: Any): JsonNode {

+                                    assignment: Any): JsonNode {

         val valueNode: JsonNode

         log.trace("Assignment ({})", assignment)

         val expressionData = BluePrintExpressionService.getExpressionData(assignment)

@@ -63,30 +65,30 @@ If Property Assignment is Expression.
 

         var valueNode: JsonNode = NullNode.getInstance()

 

-        if(expressionData.isExpression) {

+        if (expressionData.isExpression) {

             val command = expressionData.command!!

 

-            when(command){

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_INPUT ->{

+            when (command) {

+                BluePrintConstants.EXPRESSION_GET_INPUT -> {

                     valueNode = bluePrintRuntimeService.getInputValue(expressionData.inputExpression?.propertyName!!)

                 }

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_ATTRIBUTE ->{

+                BluePrintConstants.EXPRESSION_GET_ATTRIBUTE -> {

                     valueNode = resolveAttributeExpression(nodeTemplateName, expressionData.attributeExpression!!)

                 }

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_PROPERTY ->{

+                BluePrintConstants.EXPRESSION_GET_PROPERTY -> {

                     valueNode = resolvePropertyExpression(nodeTemplateName, expressionData.propertyExpression!!)

                 }

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT ->{

+                BluePrintConstants.EXPRESSION_GET_OPERATION_OUTPUT -> {

                     valueNode = resolveOperationOutputExpression(nodeTemplateName, expressionData.operationOutputExpression!!)

                 }

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_ARTIFACT ->{

+                BluePrintConstants.EXPRESSION_GET_ARTIFACT -> {

                     valueNode = resolveArtifactExpression(nodeTemplateName, expressionData.artifactExpression!!)

                 }

-                org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE ->{

+                BluePrintConstants.EXPRESSION_GET_NODE_OF_TYPE -> {

 

                 }

-                else ->{

-                    throw BluePrintException(String.format("for property ({}), command ({}) is not supported ", propName, command))

+                else -> {

+                    throw BluePrintException(format("for property ({}), command ({}) is not supported ", propName, command))

                 }

             }

         }

@@ -104,20 +106,30 @@ If Property Assignment is Expression.
         val subAttributeName: String? = attributeExpression.subAttributeName

 

         var attributeNodeTemplateName = nodeTemplateName

-        if (!attributeExpression.modelableEntityName.equals("SELF", true)) {

-            attributeNodeTemplateName = attributeExpression.modelableEntityName

-        }

-

-        val nodeTemplateAttributeExpression = bluePrintContext.nodeTemplateByName(attributeNodeTemplateName).attributes?.get(attributeName)

-                ?: throw BluePrintException(String.format("failed to get property definitions for node template ({})'s property name ({}) ", nodeTemplateName, attributeName))

+        when (attributeExpression.modelableEntityName) {

+            "ENV" -> {

+                val environmentValue = System.getProperty(attributeName)

+                valueNode = JacksonUtils.jsonNode(environmentValue)

+            }

+            else -> {

+                if (!attributeExpression.modelableEntityName.equals("SELF", true)) {

+                    attributeNodeTemplateName = attributeExpression.modelableEntityName

+                }

+                /* Enable in ONAP Dublin Release

+                val nodeTemplateAttributeExpression = bluePrintContext.nodeTemplateByName(attributeNodeTemplateName).attributes?.get(attributeName)

+                        ?: throw BluePrintException(format("failed to get attribute definitions for node template " +

+                                "({})'s property name ({}) ", nodeTemplateName, attributeName))

 

-        var propertyDefinition: AttributeDefinition = bluePrintContext.nodeTemplateNodeType(attributeNodeTemplateName).attributes?.get(attributeName)!!

+                var attributeDefinition: AttributeDefinition = bluePrintContext.nodeTemplateNodeType(attributeNodeTemplateName).attributes?.get(attributeName)!!

 

-        log.info("node template name ({}), property Name ({}) resolved value ({})", attributeNodeTemplateName, attributeName, nodeTemplateAttributeExpression)

+                log.info("node template name ({}), property Name ({}) resolved value ({})", attributeNodeTemplateName, attributeName, nodeTemplateAttributeExpression)

+                */

 

-        // Check it it is a nested expression

-        valueNode = resolveAssignmentExpression(attributeNodeTemplateName, attributeName, nodeTemplateAttributeExpression)

+                valueNode = bluePrintRuntimeService.getNodeTemplateAttributeValue(attributeNodeTemplateName, attributeName)

+                        ?: throw BluePrintException(format("failed to get node template ({})'s attribute ({}) ", nodeTemplateName, attributeName))

+            }

 

+        }

 //        subPropertyName?.let {

 //            valueNode = valueNode.at(JsonPointer.valueOf(subPropertyName))

 //        }

@@ -171,7 +183,7 @@ If Property Assignment is Expression.
     /*

     get_artifact: [ <modelable_entity_name>, <artifact_name>, <location>, <remove> ]

      */

-    fun resolveArtifactExpression(nodeTemplateName: String,  artifactExpression: ArtifactExpression): JsonNode {

+    fun resolveArtifactExpression(nodeTemplateName: String, artifactExpression: ArtifactExpression): JsonNode {

 

         var artifactNodeTemplateName = nodeTemplateName

         if (!artifactExpression.modelableEntityName.equals("SELF", true)) {

@@ -179,15 +191,15 @@ If Property Assignment is Expression.
         }

         val artifactDefinition: ArtifactDefinition = bluePrintContext.nodeTemplateByName(artifactNodeTemplateName)

                 .artifacts?.get(artifactExpression.artifactName)

-                ?: throw BluePrintException(String.format("failed to get artifact definitions for node template ({})'s " +

+                ?: throw BluePrintException(format("failed to get artifact definitions for node template ({})'s " +

                         "artifact name ({}) ", nodeTemplateName, artifactExpression.artifactName))

 

         return JacksonUtils.jsonNodeFromObject(artifactContent(artifactDefinition))

     }

 

     fun artifactContent(artifactDefinition: ArtifactDefinition): String {

-        val bluePrintBasePath: String = context[org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] as? String

-                ?: throw BluePrintException(String.format("failed to get property (%s) from context", org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH))

+        val bluePrintBasePath: String = context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] as? String

+                ?: throw BluePrintException(format("failed to get property (%s) from context", BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH))

 

         if (artifactDefinition.repository != null) {

             TODO()

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 277ec3ac..f1980d27 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -1,5 +1,6 @@
 /*

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

@@ -17,7 +18,6 @@
 package org.onap.ccsdk.apps.controllerblueprints.core.service

 

 import com.fasterxml.jackson.databind.JsonNode

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

 import org.junit.Before

 import org.junit.Test

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

@@ -48,12 +48,8 @@ class BluePrintRuntimeServiceTest {
     @Test

     fun testResolveNodeTemplateProperties() {

         log.info("************************ testResolveNodeTemplateProperties **********************")

-        val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

-                .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

 

-        val context: MutableMap<String, Any> = hashMapOf()

-        context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = basepath.plus("/simple-baseconfig")

-        val bluePrintRuntimeService = BluePrintRuntimeService(bluePrintContext, context)

+        val bluePrintRuntimeService = getBluePrintRuntimeService()

 

         val inputDataPath = "src/test/resources/data/default-context.json"

 

@@ -99,31 +95,59 @@ class BluePrintRuntimeServiceTest {
     @Test

     fun testResolveNodeTemplateInterfaceOperationOutputs() {

         log.info("************************ testResolveNodeTemplateInterfaceOperationOutputs **********************")

-        val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

-                .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

-        assertNotNull(bluePrintContext, "Failed to populate Blueprint context")

-

-        val context: MutableMap<String, Any> = hashMapOf()

-        context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = basepath.plus("/simple-baseconfig")

 

-        val bluePrintRuntimeService = BluePrintRuntimeService(bluePrintContext, context)

+        val bluePrintRuntimeService = getBluePrintRuntimeService()

 

-        val componentContext: MutableMap<String, Any?> = hashMapOf()

         val successValue: JsonNode = jsonNodeFromObject("Success")

-        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.status"] = successValue

-        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.resource-assignment-params"] = null

+        val paramValue: JsonNode = jsonNodeFromObject("param-content")

+

+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "params", paramValue)

 

         bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationOutputs("resource-assignment-ra-component",

-                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process", componentContext)

+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process")

 

-        assertEquals(NullNode.instance,

-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/resource-assignment-params"),

-                "Failed to get operation property resource-assignment-params")

+        val resourceAssignmentParamsNode = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment-ra-component",

+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process", "resource-assignment-params")

 

-        assertEquals(successValue,

-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/status"),

-                "Failed to get operation property status")

+        val statusNode = bluePrintRuntimeService.getNodeTemplateOperationOutputValue("resource-assignment-ra-component",

+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process", "status")

+

+        assertEquals(paramValue, resourceAssignmentParamsNode, "Failed to get operation property resource-assignment-params")

+

+        assertEquals(successValue, statusNode, "Failed to get operation property status")

 

 

     }

+

+    @Test

+    fun testNodeTemplateContextProperty() {

+        log.info("************************ testNodeTemplateContextProperty **********************")

+        val bluePrintRuntimeService = getBluePrintRuntimeService()

+

+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context1",

+                jsonNodeFromObject("context1-value"))

+        bluePrintRuntimeService.setNodeTemplateAttributeValue("resource-assignment-ra-component", "context2",

+                jsonNodeFromObject("context2-value"))

+

+        log.info("Context {}", bluePrintRuntimeService.context)

+

+        val keys = listOf("context1", "context2")

+

+        val jsonValueNode = bluePrintRuntimeService.getJsonForNodeTemplateAttributeProperties("resource-assignment-ra-component", keys)

+        assertNotNull(jsonValueNode, "Failed to get Json for Node Template Context Properties")

+        log.info("JSON Prepared Value Context {}", jsonValueNode)

+

+    }

+

+    private fun getBluePrintRuntimeService(): BluePrintRuntimeService {

+        val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

+                .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

+        assertNotNull(bluePrintContext, "Failed to populate Blueprint context")

+

+        val context: MutableMap<String, Any> = hashMapOf()

+        context[BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH] = basepath.plus("/simple-baseconfig")

+

+        return BluePrintRuntimeService(bluePrintContext, context)

+    }

+

 }
\ No newline at end of file