summaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model
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
commitf6ea9a3fa48bd91aaa0f13b4f613bace8b060c79 (patch)
tree2ed1e6748d2f54836b2c347bfe70a9ecb629244b /components/model-catalog/blueprint-model
parent6fcd41ca49562e11581977d733e709bf1c3d6501 (diff)
parentccd1091289c20f3834610d344b270b46cc8d90c5 (diff)
Merge "Propagate exceptions correctly"
Diffstat (limited to 'components/model-catalog/blueprint-model')
-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 fce7c3249..4cf635afe 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 ed22989fb..2d22f8bba 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 73419d716..deec47007 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