aboutsummaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
Diffstat (limited to 'components/model-catalog')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/DefaultRestconf.cba.kts4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts11
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SamplePythonComponentNode.py9
-rwxr-xr-xcomponents/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py9
5 files changed, 14 insertions, 23 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/DefaultRestconf.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/DefaultRestconf.cba.kts
index 770c36360..47412b90b 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/DefaultRestconf.cba.kts
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/DefaultRestconf.cba.kts
@@ -26,12 +26,12 @@ open class MountNEditConfigure : RestconfComponentFunction() {
return "MountNEditConfigure"
}
- override fun process(executionRequest: ExecutionServiceInput) {
+ override suspend fun processNB(executionRequest: ExecutionServiceInput) {
log.info("processing request..")
}
- override fun recover(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
+ override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ExecutionServiceInput) {
log.info("processing request..")
}
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts
index de2f15d2e..07066d7d1 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts
@@ -27,11 +27,11 @@ open class ScriptResourceAssignmentProcessor : ResourceAssignmentProcessor() {
return "ScriptResourceAssignmentProcessor"
}
- override fun process(executionRequest: ResourceAssignment) {
+ override suspend fun processNB(executionRequest: ResourceAssignment) {
log.info("Processing input")
}
- override fun recover(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {
+ override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: ResourceAssignment) {
log.info("Recovering input")
}
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts
index d28880d2e..30475652e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts
@@ -1,5 +1,6 @@
/*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2019 IBM.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,23 +25,23 @@ open class SampleKotlinComponent : BlueprintFunctionNode<String, String> {
return "my Name"
}
- override fun prepareRequest(executionRequest: String): String {
+ override suspend fun prepareRequestNB(executionRequest: String): String {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
- override fun process(executionRequest: String) {
+ override suspend fun processNB(executionRequest: String) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
- override fun recover(runtimeException: RuntimeException, executionRequest: String) {
+ override suspend fun recoverNB(runtimeException: RuntimeException, executionRequest: String) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
- override fun prepareResponse(): String {
+ override suspend fun prepareResponseNB(): String {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}
- override fun apply(t: String): String {
+ override suspend fun applyNB(t: String): String {
return "Successfully Executed Scripts"
}
}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SamplePythonComponentNode.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SamplePythonComponentNode.py
index 890481219..86c9ff141 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SamplePythonComponentNode.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SamplePythonComponentNode.py
@@ -1,18 +1,13 @@
-from abstract_blueprint_function import AbstractPythonComponentFunction
+from org.onap.ccsdk.cds.blueprintsprocessor.functions.python.executor import JythonComponentFunction
from blueprint_constants import *
-class SamplePythonComponentNode(AbstractPythonComponentFunction):
-
- def __init__(self):
- AbstractPythonComponentFunction.__init__(self)
+class SamplePythonComponentNode(JythonComponentFunction):
def process(self, execution_request):
- AbstractPythonComponentFunction.process(self, execution_request)
print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH
return None
def recover(self, runtime_exception, execution_request):
- AbstractPythonComponentFunction.recover(self, runtime_exception, execution_request)
print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH
return None
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py
index 890481219..86c9ff141 100755
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py
@@ -1,18 +1,13 @@
-from abstract_blueprint_function import AbstractPythonComponentFunction
+from org.onap.ccsdk.cds.blueprintsprocessor.functions.python.executor import JythonComponentFunction
from blueprint_constants import *
-class SamplePythonComponentNode(AbstractPythonComponentFunction):
-
- def __init__(self):
- AbstractPythonComponentFunction.__init__(self)
+class SamplePythonComponentNode(JythonComponentFunction):
def process(self, execution_request):
- AbstractPythonComponentFunction.process(self, execution_request)
print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH
return None
def recover(self, runtime_exception, execution_request):
- AbstractPythonComponentFunction.recover(self, runtime_exception, execution_request)
print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH
return None