ccsdk/apps - Applications intended to run as their own dockers (e.g micro services)

diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/netconf/executor/ComponentNetconfExecutorTest.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/netconf/executor/ComponentNetconfExecutorTest.kt
new file mode 100644
index 00000000..90a5ea0b
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/netconf/executor/ComponentNetconfExecutorTest.kt

@@ -0,0 +1,79 @@

+/*

+ *

+ * 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.functions.netconf.executor

+import com.fasterxml.jackson.databind.JsonNode

+import org.junit.Test

+import org.junit.runner.RunWith

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

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

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

+import org.onap.ccsdk.apps.blueprintsprocessor.functions.python.executor.PythonExecutorProperty

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

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

+import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintMetadataUtils

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

+import org.springframework.test.context.ContextConfiguration

+import org.springframework.test.context.TestPropertySource

+import org.springframework.test.context.junit4.SpringRunner

+@RunWith(SpringRunner::class)

+@ContextConfiguration(classes = [NetconfExecutorConfiguration::class, PythonExecutorProperty::class])

+@TestPropertySource(properties =

+["blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints",

+ "blueprints.processor.functions.python.executor.executionPath=./../../../../components/scripts/python/ccsdk_blueprints"])

+class ComponentNetconfExecutorTest {

+ @Autowired

+ lateinit var componentNetconfExecutor: ComponentNetconfExecutor

+ @Test

+ fun testComponentNetconfExecutor() {

+ val executionServiceInput = ExecutionServiceInput()

+ val commonHeader = CommonHeader()

+ commonHeader.requestId = "1234"

+ executionServiceInput.commonHeader = commonHeader

+ val actionIdentifiers = ActionIdentifiers()

+ actionIdentifiers.blueprintName = "baseconfiguration"

+ actionIdentifiers.blueprintVersion = "1.0.0"

+ actionIdentifiers.actionName = "activate"

+ executionServiceInput.actionIdentifiers = actionIdentifiers

+ val bluePrintRuntimeService = BluePrintMetadataUtils.getBluePrintRuntime(commonHeader.requestId,

+ "./../../../../components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration")

+ componentNetconfExecutor.bluePrintRuntimeService = bluePrintRuntimeService

+ val metaData: MutableMap<String, JsonNode> = hashMapOf()

+ metaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_STEP, "activate-jython")

+ val stepMetaData: MutableMap<String, JsonNode> = hashMapOf()

+ stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_NODE_TEMPLATE, "activate-jython")

+ stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_INTERFACE, "JythonExecutorComponent")

+ stepMetaData.putJsonElement(BluePrintConstants.PROPERTY_CURRENT_OPERATION, "process")

+ metaData.putJsonElement("activate-jython-step-inputs", stepMetaData)

+ executionServiceInput.metadata = metaData

+ componentNetconfExecutor.apply(executionServiceInput)

+ }

diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/logback-test.xml b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/logback-test.xml
new file mode 100644
index 00000000..f9ec9fe5
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/logback-test.xml

@@ -0,0 +1,35 @@

+<!--

+ ~

+ ~ 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.test" level="warn"/>

+ <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/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml
index efd550dd..e4f8c844 100644
--- a/ms/blueprintsprocessor/functions/pom.xml
+++ b/ms/blueprintsprocessor/functions/pom.xml

@@ -32,6 +32,7 @@

<module>resource-resolution</module>

<module>python-executor</module>

+ <module>netconf-executor</module>

</modules>

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt
index 2965cb5d..166af0f7 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutor.kt

@@ -16,37 +16,39 @@

package org.onap.ccsdk.apps.blueprintsprocessor.functions.python.executor

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

import org.apache.commons.io.FilenameUtils

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

import org.onap.ccsdk.apps.blueprintsprocessor.functions.python.executor.utils.PythonExecutorUtils

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

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

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

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

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

import org.slf4j.LoggerFactory

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

+import org.springframework.beans.factory.config.ConfigurableBeanFactory

+import org.springframework.context.ApplicationContext

+import org.springframework.context.annotation.Scope

import org.springframework.stereotype.Component

@Component("component-jython-executor")

-class ComponentJythonExecutor(private val pythonExecutorProperty: PythonExecutorProperty) : AbstractComponentFunction() {

+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)

+open class ComponentJythonExecutor(private val pythonExecutorProperty: PythonExecutorProperty) : AbstractComponentFunction() {

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

private var componentFunction: AbstractComponentFunction? = null

+ @Autowired

+ lateinit var applicationContext: ApplicationContext

- override fun process(executionServiceInput: ExecutionServiceInput) {

- log.info("Processing : ${executionServiceInput.metadata}")

- checkNotNull(bluePrintRuntimeService) { "failed to get bluePrintRuntimeService" }

+ fun populateJythonComponentInstance(executionServiceInput: ExecutionServiceInput) {

val bluePrintContext = bluePrintRuntimeService!!.bluePrintContext()

val operationAssignment: OperationAssignment = bluePrintContext

.nodeTemplateInterfaceOperation(nodeTemplateName, interfaceName, operationName)

- val blueprintBasePath: String = bluePrintRuntimeService!!.get(BluePrintConstants.PROPERTY_BLUEPRINT_BASE_PATH)?.asText()

- ?: throw BluePrintProcessorException("python execute path is missing for node template ($nodeTemplateName)")

+ val blueprintBasePath: String = bluePrintContext.rootPath

val artifactName: String = operationAssignment.implementation?.primary

?: throw BluePrintProcessorException("missing primary field to get artifact name for node template ($nodeTemplateName)")

@@ -66,12 +68,30 @@ class ComponentJythonExecutor(private val pythonExecutorProperty: PythonExecutor

pythonPath.add(blueprintBasePath)

pythonPath.addAll(pythonExecutorProperty.modulePaths)

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

- properties["log"] = log

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

+ jythonInstances["log"] = LoggerFactory.getLogger(nodeTemplateName)

+ val instanceDependenciesNode: ArrayNode = operationInputs[PythonExecutorConstants.INPUT_INSTANCE_DEPENDENCIES] as? ArrayNode

+ ?: throw BluePrintProcessorException("Failed to get property(${PythonExecutorConstants.INPUT_INSTANCE_DEPENDENCIES})")

+ instanceDependenciesNode.forEach { instanceName ->

+ jythonInstances[instanceName.textValue()] = applicationContext.getBean(instanceName.textValue())

+ }

componentFunction = PythonExecutorUtils.getPythonComponent(pythonExecutorProperty.executionPath,

- pythonPath, content, pythonClassName, properties)

+ pythonPath, content, pythonClassName, jythonInstances)

+ }

+ override fun process(executionServiceInput: ExecutionServiceInput) {

+ log.info("Processing : ${operationInputs}")

+ checkNotNull(bluePrintRuntimeService) { "failed to get bluePrintRuntimeService" }

+ // Populate Component Instance

+ populateJythonComponentInstance(executionServiceInput)

+ // Invoke Jython Component Script

componentFunction!!.process(executionServiceInput)

}

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/JythonExecutionService.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/JythonExecutionService.kt
index dc372af4..6618d13c 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/JythonExecutionService.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/JythonExecutionService.kt

@@ -33,10 +33,11 @@ class JythonExecutionService(private val pythonExecutorProperty: PythonExecutorP

lateinit var applicationContext: ApplicationContext

- fun processJythonNodeTemplate(pythonClassName: String, content: String, pythonPath: MutableList<String>,

- jythonContextInstance: MutableMap<String, Any>,

- dependencyInstanceNames: List<String>): AbstractComponentFunction {

+ fun getJythonComponentFunction(pythonClassName: String, content: String, pythonPath: MutableList<String>,

+ jythonContextInstance: MutableMap<String, Any>,

+ dependencyInstanceNames: List<String>): AbstractComponentFunction {

+ pythonPath.addAll(pythonExecutorProperty.modulePaths)

dependencyInstanceNames.forEach { instanceName ->

jythonContextInstance[instanceName] = applicationContext.getBean(instanceName)

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/PythonExecutorConfiguration.kt b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/PythonExecutorConfiguration.kt
index dd80fb0a..be7374c5 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/PythonExecutorConfiguration.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/PythonExecutorConfiguration.kt

@@ -33,4 +33,10 @@ open class PythonExecutorProperty {

@Value("#{'\${blueprints.processor.functions.python.executor.modulePaths}'.split(',')}")

lateinit var modulePaths: List<String>

+class PythonExecutorConstants {

+ companion object {

+ const val INPUT_INSTANCE_DEPENDENCIES = "instance-dependencies"

+ }

} \ No newline at end of file

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
index 23da74a8..70879748 100644
--- a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/ComponentJythonExecutorTest.kt

@@ -35,13 +35,11 @@ import org.springframework.test.context.junit4.SpringRunner

@TestPropertySource(properties =

["blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints",

"blueprints.processor.functions.python.executor.executionPath=./../../../../components/scripts/python/ccsdk_blueprints"])

class ComponentJythonExecutorTest {

@Autowired

lateinit var componentJythonExecutor: ComponentJythonExecutor

@Test

fun testPythonComponentInjection() {

diff --git a/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/mock/MockInstanceConfiguration.kt b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/mock/MockInstanceConfiguration.kt
new file mode 100644
index 00000000..41250e0c
--- /dev/null
+++ b/ms/blueprintsprocessor/functions/python-executor/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/python/executor/mock/MockInstanceConfiguration.kt

@@ -0,0 +1,32 @@

+/*

+ *

+ * 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.functions.python.executor.mock

+import org.springframework.context.annotation.Bean

+import org.springframework.context.annotation.Configuration

+@Configuration

+open class MockInstanceConfiguration {

+ @Bean(name = ["json-parser-service", "netconf-rpc-service"])

+ open fun createComponentFunction(): MockJythonService {

+ return MockJythonService()

+ }

+class MockJythonService {

+} \ No newline at end of file

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/functions/resource/resolution/ResourceResolutionComponent.kt
index a485fa62..32696c57 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/functions/resource/resolution/ResourceResolutionComponent.kt

@@ -14,13 +14,16 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution

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

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

+import org.springframework.beans.factory.config.ConfigurableBeanFactory

+import org.springframework.context.annotation.Scope

import org.springframework.stereotype.Component

@Component("component-resource-resolution")

+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)

open class ResourceResolutionComponent : AbstractComponentFunction() {

override fun process(executionRequest: ExecutionServiceInput) {

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

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/functions/resource/resolution/ResourceResolutionConstants.kt
index e234d056..aea3313c 100644
--- 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/functions/resource/resolution/ResourceResolutionConstants.kt

@@ -14,12 +14,11 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.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/functions/resource/resolution/ResourceResolutionService.kt
index 9e735cf0..2b76b78a 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/functions/resource/resolution/ResourceResolutionService.kt

@@ -15,7 +15,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution

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

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

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DataBaseResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolutionprocessor/DataBaseResourceAssignmentProcessor.kt
index 66e43f1b..80b2d0b7 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/DataBaseResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolutionprocessor/DataBaseResourceAssignmentProcessor.kt

@@ -15,7 +15,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor

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

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

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/functions/resource/resolutionprocessor/DefaultResourceAssignmentProcessor.kt
index e701e718..05529254 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/functions/resource/resolutionprocessor/DefaultResourceAssignmentProcessor.kt

@@ -15,7 +15,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor

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

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

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/functions/resource/resolutionprocessor/InputResourceAssignmentProcessor.kt
index 9e177d46..73fd3a1f 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/functions/resource/resolutionprocessor/InputResourceAssignmentProcessor.kt

@@ -15,7 +15,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor

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

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

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SimpleRestResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolutionprocessor/SimpleRestResourceAssignmentProcessor.kt
index e1b9a8ef..64c8a1d3 100644
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/resolution/processor/SimpleRestResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/functions/resource/resolutionprocessor/SimpleRestResourceAssignmentProcessor.kt

@@ -15,7 +15,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor

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

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

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/functions/resource/resolution/ResourceResolutionServiceTest.kt
index 62adde73..238d1b0a 100644
--- 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/functions/resource/resolution/ResourceResolutionServiceTest.kt

@@ -14,7 +14,7 @@

* limitations under the License.

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

+package org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution

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

import org.apache.commons.collections.CollectionUtils

@@ -23,10 +23,10 @@ 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.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.blueprintsprocessor.functions.resource.resolutionprocessor.DataBaseResourceAssignmentProcessor

+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor.DefaultResourceAssignmentProcessor

+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor.InputResourceAssignmentProcessor

+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolutionprocessor.SimpleRestResourceAssignmentProcessor

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

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

import org.slf4j.LoggerFactory

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 8aeb4153..0f3b4a82 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

@@ -19,7 +19,7 @@ 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.services.resolution.ResourceResolutionService;

+import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.ResourceResolutionService;

import org.springframework.http.MediaType;

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

import reactor.core.publisher.Mono;

diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/BlueprintServiceLogicTest.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/BlueprintServiceLogicTest.kt
index 2c1c40c9..7312d2de 100644
--- a/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/BlueprintServiceLogicTest.kt
+++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/test/kotlin/org/onap/ccsdk/apps/blueprintsprocessor/services/workflow/BlueprintServiceLogicTest.kt

@@ -20,12 +20,16 @@ import org.junit.Test

import org.junit.runner.RunWith

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

import org.onap.ccsdk.apps.blueprintsprocessor.services.workflow.executor.ComponentExecuteNodeExecutor

+import org.onap.ccsdk.apps.blueprintsprocessor.services.workflow.mock.PrototypeComponentFunction

+import org.onap.ccsdk.apps.blueprintsprocessor.services.workflow.mock.SingletonComponentFunction

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

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

import org.slf4j.LoggerFactory

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

+import org.springframework.context.ApplicationContext

import org.springframework.test.context.ContextConfiguration

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

+import kotlin.test.assertEquals

@RunWith(SpringRunner::class)

@ContextConfiguration(classes = [WorkflowServiceConfiguration::class, ComponentExecuteNodeExecutor::class])

@@ -34,6 +38,9 @@ class BlueprintServiceLogicTest {

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

@Autowired

+ lateinit var applicationContext: ApplicationContext

+ @Autowired

lateinit var blueprintDGExecutionService: BlueprintDGExecutionService

@Test

@@ -61,4 +68,26 @@ class BlueprintServiceLogicTest {

}

+ @Test

+ fun testSingleton() {

+ val singleton1 = applicationContext.getBean(SingletonComponentFunction::class.java)

+ singleton1.stepName = "step1"

+ val singleton2 = applicationContext.getBean(SingletonComponentFunction::class.java)

+ assertEquals(singleton1.stepName, singleton2.stepName, " failed to get singleton data")

+ }

+ @Test

+ fun testProtoTypeFunction() {

+ val stepName1 = "step1"

+ val stepName2 = "step2"

+ val proto1 = applicationContext.getBean(PrototypeComponentFunction::class.java)

+ proto1.stepName = stepName1

+ val proto2 = applicationContext.getBean(PrototypeComponentFunction::class.java)

+ proto2.stepName = stepName2

+ assertEquals(stepName1, proto1.stepName, " Failed to match the step1 name")

+ assertEquals(stepName2, proto2.stepName, " Failed to match the step2 name")

+ }

} \ No newline at end of file

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 9f7a9c97..1d738eef 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

@@ -20,8 +20,11 @@ import org.onap.ccsdk.apps.blueprintsprocessor.core.api.data.ExecutionServiceInp

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

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

import org.slf4j.LoggerFactory

+import org.springframework.beans.factory.config.ConfigurableBeanFactory

import org.springframework.context.annotation.Bean

import org.springframework.context.annotation.Configuration

+import org.springframework.context.annotation.Scope

+import org.springframework.stereotype.Component

@Configuration

open class MockComponentConfiguration {

@@ -46,4 +49,34 @@ class MockComponentFunction : AbstractComponentFunction() {

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

log.info("Recovering component..")

}

+@Component("singleton-function")

+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)

+class SingletonComponentFunction : AbstractComponentFunction() {

+ private val log = LoggerFactory.getLogger(MockComponentFunction::class.java)

+ override fun process(executionRequest: ExecutionServiceInput) {

+ log.info("Processing component : ${operationInputs}")

+ }

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

+ log.info("Recovering component..")

+ }

+@Component("prototype-function")

+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)

+class PrototypeComponentFunction : AbstractComponentFunction() {

+ private val log = LoggerFactory.getLogger(MockComponentFunction::class.java)

+ override fun process(executionRequest: ExecutionServiceInput) {

+ log.info("Processing component : ${operationInputs}")

+ }

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

+ log.info("Recovering component..")

+ }

} \ No newline at end of file

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 3ad3fef3..796aef16 100644
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml

@@ -206,6 +206,16 @@

<artifactId>resource-resolution</artifactId>

<version>${project.version}</version>

</dependency>

+ <dependency>

+ <groupId>org.onap.ccsdk.apps.blueprintsprocessor.functions</groupId>

+ <artifactId>python-executor</artifactId>

+ <version>${project.version}</version>

+ </dependency>

+ <dependency>

+ <groupId>org.onap.ccsdk.apps.blueprintsprocessor.functions</groupId>

+ <artifactId>netconf-executor</artifactId>

+ <version>${project.version}</version>

+ </dependency>

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
index 7ea81da0..aaa45e14 100644
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/BluePrintEnhancerService.java

@@ -34,7 +34,6 @@ import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.BluePrintEnhanc

import org.onap.ccsdk.apps.controllerblueprints.service.enhancer.ResourceAssignmentEnhancerService;

import org.springframework.beans.factory.config.ConfigurableBeanFactory;

import org.springframework.context.annotation.Scope;

-import org.springframework.context.annotation.ScopedProxyMode;

import org.springframework.stereotype.Service;

import java.util.HashMap;

@@ -48,7 +47,7 @@ import java.util.Map;

@Service

-@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE, proxyMode = ScopedProxyMode.TARGET_CLASS)

+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)

public class BluePrintEnhancerService extends BluePrintEnhancerDefaultService {

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


context:
space:
mode: