Adjust python script for resource-assignment

Change-Id: Ie96b4dc99c4da461a5fe7dfb424fdec6c221f9e0
Issue-ID: CCSDK-1091
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

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 30b9ff9..acf12b3 100755 (executable)
--- 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/scripts/python/ccsdk_blueprints/abstract_ra_processor.py b/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py
index 2cacaf5..6489b1e 100644 (file)
--- a/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py
+++ b/components/scripts/python/ccsdk_blueprints/abstract_ra_processor.py
@@ -1,49 +1,29 @@
-from org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.processor import ResourceAssignmentProcessor
-from blueprint_constants import *
-from org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.utils import ResourceAssignmentUtils
-from org.onap.ccsdk.apps.controllerblueprints.core import BluePrintProcessorException
-from java.lang import Exception
+from org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.processor import \
+    ResourceAssignmentProcessor
+from org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.utils import \
+    ResourceAssignmentUtils
+from org.onap.ccsdk.apps.controllerblueprints.core import \
+    BluePrintProcessorException
 
 
 class AbstractRAProcessor(ResourceAssignmentProcessor):
 
-    def __init__(self):
-        ResourceAssignmentProcessor.__init__(self)
-        self.status = PROPERTY_BLUEPRINT_STATUS_SUCCESS
-        self.error_message = None
-        self.ra_valid = False
-        self.value_to_resolve = None
-
-    def process(self, execution_request):
-        print "Processing calling from parent..."
-        try:
-            self.ra_valid = self.validate(execution_request)
-            self.value_to_resolve = execution_request.name
-        except Exception, e:
-            self.status = PROPERTY_BLUEPRINT_STATUS_FAILURE
-            self.error_message = "Get Running python scripting Failure :" + e.getMessage()
+    def process(self, resource_assignment):
+        print "Processing.."
+        return None
 
-    def recover(self, runtime_exception, execution_request):
-        print "Recovering calling from parent.."
+    def recover(self, runtime_exception, resource_assignment):
+        print "Recovering.."
         return None
 
-    def set_resource_data_value(self, execution_request, value):
+    def set_resource_data_value(self, resource_assignment, value):
         try:
             if value is not None:
-                ResourceAssignmentUtils.Companion.setResourceDataValue(execution_request, self.raRuntimeService, value)
+                ResourceAssignmentUtils.Companion.setResourceDataValue(
+                    resource_assignment, self.raRuntimeService, value)
             else:
-                ResourceAssignmentUtils.Companion.setFailedResourceDataValue(execution_request, "Fail to resole value")
+                ResourceAssignmentUtils.Companion.setFailedResourceDataValue(
+                    resource_assignment, "Fail to resolve value")
         except BluePrintProcessorException, err:
-            raise BluePrintProcessorException("Error on resource assignment. Message = " + err.message)
-
-        return None
-
-    @staticmethod
-    def validate(ra):
-        if ra.name is None or ra.name is None:
-            raise Exception("Failed getting value for template key (" + ra.name + ") and " +
-                            "dictionary key (" + ra.dictionaryName +
-                            ") of type (" + ra.type + ")")
-        else:
-            pass
-        return True
+            raise BluePrintProcessorException(
+                "Error on resource assignment. Message = " + err.message)

diff --git a/components/scripts/python/ccsdk_blueprints/sample_ra_processor_function.py b/components/scripts/python/ccsdk_blueprints/sample_ra_processor_function.py
index 6ec5d82..fa82108 100644 (file)
--- a/components/scripts/python/ccsdk_blueprints/sample_ra_processor_function.py
+++ b/components/scripts/python/ccsdk_blueprints/sample_ra_processor_function.py
@@ -4,15 +4,11 @@ from blueprint_constants import *
 
 class SampleRAProcessorFunction(AbstractRAProcessor):
 
-    def __init__(self):
-        AbstractRAProcessor.__init__(self)
-
-    def process(self, execution_request):
-        AbstractRAProcessor.process(self, execution_request)
+    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)
+    def recover(self, runtime_exception, resource_assignment):
         print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
         return None