diff options
author | Michael Hwang <mhwang@research.att.com> | 2017-09-12 17:28:37 -0400 |
---|---|---|
committer | Michael Hwang <mhwang@research.att.com> | 2017-09-12 17:30:38 -0400 |
commit | 9d0a254d0bcd6e966c47f2656527274ab1787d97 (patch) | |
tree | d13c8afc7d40087fa840ad0f537ec31a666df97e /docker/dockerplugin/tasks.py | |
parent | 9444408bb1ab548995a81d4efe678d298aca66df (diff) |
Combine all task inputs for create and start
Change-Id: Ia86d3b26b5ecccd636fb171b3967f924b0cb1250
Issue-Id: DCAEGEN2-91
Signed-off-by: Michael Hwang <mhwang@research.att.com>
Diffstat (limited to 'docker/dockerplugin/tasks.py')
-rw-r--r-- | docker/dockerplugin/tasks.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/dockerplugin/tasks.py b/docker/dockerplugin/tasks.py index e42e47d..9d33a8b 100644 --- a/docker/dockerplugin/tasks.py +++ b/docker/dockerplugin/tasks.py @@ -28,7 +28,7 @@ import dockering as doc from dcaepolicy import Policies, POLICIES, POLICY_MESSAGE_TYPE from dockerplugin import discovery as dis from dockerplugin.decorators import monkeypatch_loggers, wrap_error_handling_start, \ - merge_inputs_for_start + merge_inputs_for_start, merge_inputs_for_create from dockerplugin.exceptions import DockerPluginDeploymentError, \ DockerPluginDependencyNotReadyError from dockerplugin import utils @@ -119,10 +119,11 @@ def _merge_policy_updates(**kwargs): return kwargs +@merge_inputs_for_create @monkeypatch_loggers @Policies.gather_policies_to_node @operation -def create_for_components(**kwargs): +def create_for_components(**create_inputs): """Create step for Docker containers that are components This interface is responible for: @@ -134,7 +135,7 @@ def create_for_components(**kwargs): **_setup_for_discovery( **_merge_policy_updates( **_generate_component_name( - **ctx.node.properties)))) + **create_inputs)))) def _parse_streams(**kwargs): @@ -201,10 +202,11 @@ def _setup_for_discovery_streams(**kwargs): return kwargs +@merge_inputs_for_create @monkeypatch_loggers @Policies.gather_policies_to_node @operation -def create_for_components_with_streams(**kwargs): +def create_for_components_with_streams(**create_inputs): """Create step for Docker containers that are components that use DMaaP This interface is responible for: @@ -220,12 +222,13 @@ def create_for_components_with_streams(**kwargs): **_merge_policy_updates( **_parse_streams( **_generate_component_name( - **ctx.node.properties)))))) + **create_inputs)))))) +@merge_inputs_for_create @monkeypatch_loggers @operation -def create_for_platforms(**kwargs): +def create_for_platforms(**create_inputs): """Create step for Docker containers that are platform components This interface is responible for: @@ -234,7 +237,7 @@ def create_for_platforms(**kwargs): """ _done_for_create( **_setup_for_discovery( - **ctx.node.properties)) + **create_inputs)) def _lookup_service(service_component_name, consul_host=CONSUL_HOST, |