Merge "Python library for Jython execution"

3 files changed, 34 insertions, 4 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index c88712146..d2d32e81e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -11,6 +11,14 @@
       "input": {
         "type": "source-input",
         "properties": {}
+      },
+      "capability": {
+        "type": "source-capability",
+        "properties": {
+          "type": "JYTHON-COMPONENT",
+          "instance-name": "SampleRAProcessor",
+          "instance-dependencies": []
+        }
       }
     }
   },
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 0a583dc57..890481219 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,12 +1,18 @@
 from abstract_blueprint_function import AbstractPythonComponentFunction
 from blueprint_constants import *
 
+
 class SamplePythonComponentNode(AbstractPythonComponentFunction):
 
+    def __init__(self):
+        AbstractPythonComponentFunction.__init__(self)
+
     def process(self, execution_request):
-        print "Processing calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+        AbstractPythonComponentFunction.process(self, execution_request)
+        print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH
         return None
 
     def recover(self, runtime_exception, execution_request):
-        print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+        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/baseconfiguration/Scripts/python/SampleRAProcessor.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py
index 9729f04f2..30b9ff951 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/SampleRAProcessor.py
@@ -4,10 +4,26 @@ from blueprint_constants import *
 
 class SampleRAProcessor(AbstractRAProcessor):
 
+    def __init__(self):
+        AbstractRAProcessor.__init__(self)
+
     def process(self, execution_request):
-        print "Processing calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+
+        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)
         return None
 
     def recover(self, runtime_exception, execution_request):
-        print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+        AbstractRAProcessor.recover(self, runtime_exception, execution_request)
+        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"