summaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
Diffstat (limited to 'components/model-catalog')
-rwxr-xr-xcomponents/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SampleRAProcessor.py22
-rw-r--r--components/model-catalog/definition-type/starter-type/node_type/source-capability.json14
-rw-r--r--components/model-catalog/proto-definition/proto/BluePrintCommon.proto9
3 files changed, 20 insertions, 25 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SampleRAProcessor.py b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SampleRAProcessor.py
index 30b9ff951..acf12b333 100755
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SampleRAProcessor.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SampleRAProcessor.py
@@ -7,23 +7,11 @@ class SampleRAProcessor(AbstractRAProcessor):
def __init__(self):
AbstractRAProcessor.__init__(self)
- def process(self, execution_request):
-
- AbstractRAProcessor.process(self, execution_request)
- print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH
- if self.ra_valid is True:
- value = self.resolve_values_script(execution_request, self.value_to_resolve)
- self.set_resource_data_value(execution_request, value)
- else:
- raise BluePrintProcessorException("Error on resource assignment. Message = " + self.error_message)
+ def process(self, resource_assignment):
+ print "Processing calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+ self.set_resource_data_value(resource_assignment, "")
return None
- def recover(self, runtime_exception, execution_request):
- AbstractRAProcessor.recover(self, runtime_exception, execution_request)
- print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH
+ def recover(self, runtime_exception, resource_assignment):
+ print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
return None
-
- def resolve_values_script(self, execution_request, value_to_resolve):
- # TODO : DO business logic here
- print "Resolve value for " + value_to_resolve + " here..."
- return "test_python"
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
index 4d9488cbc..e0c440649 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
@@ -2,22 +2,22 @@
"description": "This is Component Resource Source Node Type",
"version": "1.0.0",
"properties": {
- "type": {
+ "script-type": {
"required": true,
"type": "string",
- "default": "KOTLIN-COMPONENT",
+ "default": "kotlin",
"constraints": [
{
"valid_values": [
- "KOTLIN-COMPONENT",
- "JAVA-COMPONENT",
- "JYTHON-COMPONENT"
+ "kotlin",
+ "internal",
+ "jython"
]
}
]
},
- "instance-name": {
- "description": "Capability component instance reference name for JAVA-COMPONENT, Script Class name for KOTLIN-COMPONENT.",
+ "script-class-reference": {
+ "description": "Capability reference name for internal and kotlin, for jython script file path",
"required": true,
"type": "string"
},
diff --git a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto
index 0f17783aa..de92bdc1c 100644
--- a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto
+++ b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto
@@ -26,6 +26,13 @@ message Status {
int32 code = 1;
string errorMessage = 2;
string message = 3;
- string eventType = 4;
+ EventType eventType = 4;
string timestamp = 5;
+}
+
+enum EventType {
+ EVENT_COMPONENT_FAILURE = 0;
+ EVENT_COMPONENT_PROCESSING = 1;
+ EVENT_COMPONENT_NOTIFICATION = 2;
+ EVENT_COMPONENT_EXECUTED = 3;
} \ No newline at end of file