You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by av...@apache.org on 2017/04/02 15:20:15 UTC
[1/2] incubator-ariatosca git commit: Only print description in
`service-templates` show if one exists
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-48-aria-cli 1ce38468e -> 6d366d209
Only print description in `service-templates` show if one exists
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9f00f425
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9f00f425
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9f00f425
Branch: refs/heads/ARIA-48-aria-cli
Commit: 9f00f425505a8fe12911138c8e2f359109b6caa4
Parents: 36981a7
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Sun Apr 2 18:17:31 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Sun Apr 2 18:17:31 2017 +0300
----------------------------------------------------------------------
aria/cli/commands/service_templates.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9f00f425/aria/cli/commands/service_templates.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/service_templates.py b/aria/cli/commands/service_templates.py
index 823a6e8..af6252a 100644
--- a/aria/cli/commands/service_templates.py
+++ b/aria/cli/commands/service_templates.py
@@ -61,8 +61,9 @@ def show(service_template_id, model_storage, logger):
columns = SERVICE_TEMPLATE_COLUMNS + ['#services']
print_data(columns, service_template_dict, 'Service-template:', max_width=50)
- logger.info('Description:')
- logger.info('{0}\n'.format(service_template_dict['description'].encode('UTF-8') or ''))
+ if service_template_dict['description'] is not None:
+ logger.info('Description:')
+ logger.info('{0}\n'.format(service_template_dict['description'].encode('UTF-8') or ''))
logger.info('Existing services:')
logger.info('{0}\n'.format(json.dumps([d['name'] for d in services])))
[2/2] incubator-ariatosca git commit: Merge branch 'ARIA-48-aria-cli'
of https://git-wip-us.apache.org/repos/asf/incubator-ariatosca into
ARIA-48-aria-cli
Posted by av...@apache.org.
Merge branch 'ARIA-48-aria-cli' of https://git-wip-us.apache.org/repos/asf/incubator-ariatosca into ARIA-48-aria-cli
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/6d366d20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/6d366d20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/6d366d20
Branch: refs/heads/ARIA-48-aria-cli
Commit: 6d366d209ca9b7d4c4dfe8a572c5bd60518c064a
Parents: 9f00f42 1ce3846
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Sun Apr 2 18:18:36 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Sun Apr 2 18:18:36 2017 +0300
----------------------------------------------------------------------
aria/cli/commands/node_templates.py | 2 +-
aria/core.py | 8 +++-----
aria/utils/type.py | 1 +
tests/orchestrator/workflows/api/test_task.py | 15 +++++++++------
...test_process_executor_concurrent_modifications.py | 3 ++-
.../executor/test_process_executor_extension.py | 3 ++-
.../test_process_executor_tracked_changes.py | 6 ++++--
7 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------