[1/3] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/master 25ce830b7 -> 9174f9469 (forced update) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9174f946/tests/orchestrator/workflows/api/test_task.py -- diff --git a/tests/orchestrator/workflows/api/test_task.py b/tests/orchestrator/workflows/api/test_task.py index 642c785..9d91b6b 100644 --- a/tests/orchestrator/workflows/api/test_task.py +++ b/tests/orchestrator/workflows/api/test_task.py @@ -44,15 +44,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs),) + function='op_path', + arguments=arguments),) node = ctx.model.node.get_by_name(mock.models.DEPENDENT_NODE_NAME) node.interfaces[interface_name] = interface @@ -66,7 +66,7 @@ class TestOperationTask(object): node, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval, ignore_failure=ignore_failure) @@ -77,9 +77,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == node -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.ignore_failure == ignore_failure @@ -92,15 +92,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.plugin.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -113,7 +113,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval) @@ -123,9 +123,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == relationship -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.plugin.name == 'test_plugin' @@ -137,15 +137,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -158,7 +158,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval) @@ -168,9 +
[1/3] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-149-functions-in-operation-configuration b602f1455 -> 25ce830b7 (forced update) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/25ce830b/tests/orchestrator/workflows/api/test_task.py -- diff --git a/tests/orchestrator/workflows/api/test_task.py b/tests/orchestrator/workflows/api/test_task.py index 642c785..9d91b6b 100644 --- a/tests/orchestrator/workflows/api/test_task.py +++ b/tests/orchestrator/workflows/api/test_task.py @@ -44,15 +44,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs),) + function='op_path', + arguments=arguments),) node = ctx.model.node.get_by_name(mock.models.DEPENDENT_NODE_NAME) node.interfaces[interface_name] = interface @@ -66,7 +66,7 @@ class TestOperationTask(object): node, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval, ignore_failure=ignore_failure) @@ -77,9 +77,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == node -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.ignore_failure == ignore_failure @@ -92,15 +92,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.plugin.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -113,7 +113,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval) @@ -123,9 +123,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == relationship -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.plugin.name == 'test_plugin' @@ -137,15 +137,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -158,7 +158,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retr
[1/3] incubator-ariatosca git commit: ARIA-149 Enhance operation configuration [Forced Update!]
Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-149-functions-in-operation-configuration adf98c990 -> b602f1455 (forced update) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b602f145/tests/orchestrator/workflows/api/test_task.py -- diff --git a/tests/orchestrator/workflows/api/test_task.py b/tests/orchestrator/workflows/api/test_task.py index 642c785..9d91b6b 100644 --- a/tests/orchestrator/workflows/api/test_task.py +++ b/tests/orchestrator/workflows/api/test_task.py @@ -44,15 +44,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs),) + function='op_path', + arguments=arguments),) node = ctx.model.node.get_by_name(mock.models.DEPENDENT_NODE_NAME) node.interfaces[interface_name] = interface @@ -66,7 +66,7 @@ class TestOperationTask(object): node, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval, ignore_failure=ignore_failure) @@ -77,9 +77,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == node -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.ignore_failure == ignore_failure @@ -92,15 +92,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.plugin.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -113,7 +113,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retry_interval=retry_interval) @@ -123,9 +123,9 @@ class TestOperationTask(object): interface=interface_name, operation=operation_name ) -assert api_task.implementation == 'op_path' +assert api_task.function == 'op_path' assert api_task.actor == relationship -assert api_task.inputs['test_input'].value is True +assert api_task.arguments['test_input'].value is True assert api_task.retry_interval == retry_interval assert api_task.max_attempts == max_attempts assert api_task.plugin.name == 'test_plugin' @@ -137,15 +137,15 @@ class TestOperationTask(object): plugin = mock.models.create_plugin('test_plugin', '0.1') ctx.model.node.update(plugin) -inputs = {'test_input': True} +arguments = {'test_input': True} interface = mock.models.create_interface( ctx.service, interface_name, operation_name, operation_kwargs=dict(plugin=plugin, - implementation='op_path', - inputs=inputs) + function='op_path', + arguments=arguments) ) relationship = ctx.model.relationship.list()[0] @@ -158,7 +158,7 @@ class TestOperationTask(object): relationship, interface_name=interface_name, operation_name=operation_name, -inputs=inputs, +arguments=arguments, max_attempts=max_attempts, retr