diff options
Diffstat (limited to 'components/model-catalog/blueprint-model')
9 files changed, 17 insertions, 17 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py index 2fd6c6659..a11b0d4b7 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py @@ -42,11 +42,11 @@ class NetconfRpcExample(AbstractScriptComponentFunction): nc.unlock() nc.disconnect() - except JavaException, err: + except JavaException as err: log.error("Java Exception in the script {}", err) - except Exception, err: + except Exception as err: log.error("Python Exception in the script {}", err) def recover(self, runtime_exception, execution_request): - print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH + print("Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH) return None 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 86c9ff141..1ee41825d 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 @@ -5,9 +5,9 @@ from blueprint_constants import * class SamplePythonComponentNode(JythonComponentFunction): def process(self, execution_request): - print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH + print("Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH) return None def recover(self, runtime_exception, execution_request): - print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH + 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 30b9ff951..beb544b2c 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 @@ -10,7 +10,7 @@ class SampleRAProcessor(AbstractRAProcessor): def process(self, execution_request): AbstractRAProcessor.process(self, execution_request) - print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH + 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) @@ -20,10 +20,10 @@ class SampleRAProcessor(AbstractRAProcessor): def recover(self, runtime_exception, execution_request): AbstractRAProcessor.recover(self, runtime_exception, execution_request) - print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH + 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..." + print("Resolve value for " + value_to_resolve + " here...") return "test_python" diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py index 5038caa77..15eb38c16 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py @@ -37,12 +37,12 @@ class DefaultGetNetConfig(AbstractPythonComponentFunction): if (deviceResponse.status != netconf_constant.STATUS_SUCCESS and deviceResponse.errorMessage != 'null'): errorMessage = "Get Running Config Failure ::"+ deviceResponse.errorMessage - except Exception, err: + except Exception as err: log.info("Exception in the script {}",err.getMessage()) status = netconf_constant.STATUS_FAILURE errorMessage = "Get Running Config Failure ::"+err.getMessage() def recover(self, runtime_exception, execution_request): - print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH + print("Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH) return None diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py index 86c9ff141..1ee41825d 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/SamplePythonComponentNode.py @@ -5,9 +5,9 @@ from blueprint_constants import * class SamplePythonComponentNode(JythonComponentFunction): def process(self, execution_request): - print "Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH + print("Processing calling..." + PROPERTY_BLUEPRINT_BASE_PATH) return None def recover(self, runtime_exception, execution_request): - print "Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH + print("Recovering calling..." + PROPERTY_BLUEPRINT_BASE_PATH) return None 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 acf12b333..c76c589c2 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 @@ -8,10 +8,10 @@ class SampleRAProcessor(AbstractRAProcessor): AbstractRAProcessor.__init__(self) def process(self, resource_assignment): - print "Processing calling.." + PROPERTY_BLUEPRINT_BASE_PATH + print("Processing calling.." + PROPERTY_BLUEPRINT_BASE_PATH) self.set_resource_data_value(resource_assignment, "") return None def recover(self, runtime_exception, resource_assignment): - print "Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH + print("Recovering calling.." + PROPERTY_BLUEPRINT_BASE_PATH) return None diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/ConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/ConfigDeploy.py index 2146be7ce..7e80fd813 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/ConfigDeploy.py +++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/ConfigDeploy.py @@ -48,5 +48,5 @@ class ConfigDeploy(NetconfComponentFunction): def recover(self, runtime_exception, execution_request): log.error("Exception in the script {}", runtime_exception) - print self.addError(runtime_exception.cause.message) + print(self.addError(runtime_exception.cause.message)) return None 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 8482a89d3..66c6e32c6 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 @@ -38,5 +38,5 @@ class DescriptionExample(AbstractRAProcessor): def recover(self, runtime_exception, resource_assignment): log.error("Exception in the script {}", runtime_exception) - print self.addError(runtime_exception.cause.message) + print(self.addError(runtime_exception.cause.message)) 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 40b3c3dcd..dbfdade2b 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 @@ -39,5 +39,5 @@ class Rollback(NetconfComponentFunction): def recover(self, runtime_exception, execution_request): log.error("Exception in the script {}", runtime_exception) - print self.addError(runtime_exception.cause.message) + print(self.addError(runtime_exception.cause.message)) return None |