You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by em...@apache.org on 2017/05/05 18:00:41 UTC
[2/4] incubator-ariatosca git commit: ARIA-209 Fix create-archive CLI
command help
ARIA-209 Fix create-archive CLI command help
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/85539771
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/85539771
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/85539771
Branch: refs/heads/ARIA-139-attributes
Commit: 85539771c09ec34126fd03960ac3d242f226ddeb
Parents: 8ca3ff2
Author: Ran Ziv <ra...@gigaspaces.com>
Authored: Thu May 4 17:07:50 2017 +0300
Committer: Ran Ziv <ra...@gigaspaces.com>
Committed: Thu May 4 18:01:17 2017 +0300
----------------------------------------------------------------------
aria/cli/commands/service_templates.py | 11 ++++++-----
tests/cli/test_service_templates.py | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/85539771/aria/cli/commands/service_templates.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/service_templates.py b/aria/cli/commands/service_templates.py
index 97367c2..2537012 100644
--- a/aria/cli/commands/service_templates.py
+++ b/aria/cli/commands/service_templates.py
@@ -182,20 +182,21 @@ def validate(service_template, service_template_filename,
@service_templates.command(name='create-archive',
- short_help='Create a csar archive')
+ short_help='Create a CSAR archive')
@aria.argument('service-template-path')
@aria.argument('destination')
@aria.options.verbose()
@aria.pass_logger
def create_archive(service_template_path, destination, logger):
- """Create a csar archive
+ """Create a csar archive on the local file system
`service_template_path` is the path of the service template to create the archive from
- `destination` is the path of the output csar archive
+
+ `destination` is the path of the output CSAR archive file
"""
- logger.info('Creating a csar archive')
+ logger.info('Creating a CSAR archive')
csar.write(os.path.dirname(service_template_path), service_template_path, destination, logger)
- logger.info('Csar archive created at {0}'.format(destination))
+ logger.info('CSAR archive created at {0}'.format(destination))
def print_service_template_inputs(model_storage, service_template_name, logger):
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/85539771/tests/cli/test_service_templates.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_service_templates.py b/tests/cli/test_service_templates.py
index 01b3f67..dd9eedd 100644
--- a/tests/cli/test_service_templates.py
+++ b/tests/cli/test_service_templates.py
@@ -238,9 +238,9 @@ class TestServiceTemplatesCreateArchive(TestCliBase):
monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
self.invoke('service_templates create_archive stubpath stubdest')
- assert 'Creating a csar archive' in self.logger_output_string
+ assert 'Creating a CSAR archive' in self.logger_output_string
def test_create_archive_successful(self, monkeypatch, mock_object):
monkeypatch.setattr(csar, 'write', mock_object)
self.invoke('service_templates create_archive stubpath stubdest')
- assert 'Csar archive created at stubdest' in self.logger_output_string
+ assert 'CSAR archive created at stubdest' in self.logger_output_string