From d915471db1503147d8b9cc983b1d722ea1567294 Mon Sep 17 00:00:00 2001 From: Sergey Kraynev Date: Thu, 10 Dec 2015 11:49:45 -0500 Subject: [PATCH] Stop ignore skipped crypt_operation option Previously we used "nargs='?'" parameter for 'crypt_operation' option. It leads to situation, when we execute this command without any result or error. Now when user will try to execute this command he will get message, that should specify 'crypt_operation' option. Note, that we used same parameters for other heat-manage commands. However, it can be used, because if user will not provide these options, then commands will be executed with default values (sometimes it's None). All these default values are expected in utility functions or db functions. Also comments were added for clarification commands and their arguments. Change-Id: I561bc7fc83e6d845c9b59d85c59650e640001190 --- heat/cmd/manage.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/heat/cmd/manage.py b/heat/cmd/manage.py index ce202b6d5f..c55485186e 100644 --- a/heat/cmd/manage.py +++ b/heat/cmd/manage.py @@ -104,30 +104,38 @@ def do_crypt_parameters_and_properties(): def add_command_parsers(subparsers): + # db_version parser parser = subparsers.add_parser('db_version') parser.set_defaults(func=do_db_version) + # db_sync parser parser = subparsers.add_parser('db_sync') parser.set_defaults(func=do_db_sync) + # positional parameter, can be skipped. default=None parser.add_argument('version', nargs='?') + # purge_deleted parser parser = subparsers.add_parser('purge_deleted') parser.set_defaults(func=purge_deleted) + # positional parameter, can be skipped. default='90' parser.add_argument('age', nargs='?', default='90', help=_('How long to preserve deleted data.')) + # optional parameter, can be skipped. default='days' parser.add_argument( '-g', '--granularity', default='days', choices=['days', 'hours', 'minutes', 'seconds'], help=_('Granularity to use for age argument, defaults to days.')) + # update_params parser parser = subparsers.add_parser('update_params') parser.set_defaults(func=do_crypt_parameters_and_properties) + # positional parameter, can't be skipped parser.add_argument('crypt_operation', - nargs='?', choices=['encrypt', 'decrypt'], help=_('Valid values are encrypt or decrypt. The ' 'heat-engine processes must be stopped to use ' 'this.')) + # positional parameter, can be skipped. default=None parser.add_argument('previous_encryption_key', nargs='?', default=None,