aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-18 18:30:49 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-18 18:30:49 +0000
commitf24666c55d17ef296746ea103218d1c489380a00 (patch)
treed5096fda46c8a32f411abbae7018213a76873e78 /components
parenta0f6c597b54f42e141be6f41c6b228f4dc3ee988 (diff)
parentd60057a77e7ac601d3796096f36c4b9ca585d1a5 (diff)
Merge "Propagate exceptions correctly"0.4.1
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/DescriptionExample.py4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/DescriptionExample.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/DescriptionExample.py
index fce7c324..4cf635af 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/DescriptionExample.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/DescriptionExample.py
@@ -42,5 +42,5 @@ class DescriptionExample(AbstractRAProcessor):
return None
def recover(self, runtime_exception, resource_assignment):
- print "NoOp"
- return None
+ print self.addError(runtime_exception.getMessage())
+ return None \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py
index ed22989f..2d22f8bb 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py
@@ -57,5 +57,5 @@ class NetconfRpcExample(NetconfComponentFunction):
log.error("Python Exception in the script {}", err)
def recover(self, runtime_exception, execution_request):
- print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+ print self.addError(runtime_exception.getMessage())
return None
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py
index 73419d71..deec4700 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py
@@ -43,5 +43,5 @@ class Rollback(NetconfComponentFunction):
log.error("Python Exception in the script {}", err)
def recover(self, runtime_exception, execution_request):
- print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH
+ print self.addError(runtime_exception.getMessage())
return None