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
This commit is contained in:
parent
a77739b46b
commit
d915471db1
@ -104,30 +104,38 @@ def do_crypt_parameters_and_properties():
|
|||||||
|
|
||||||
|
|
||||||
def add_command_parsers(subparsers):
|
def add_command_parsers(subparsers):
|
||||||
|
# db_version parser
|
||||||
parser = subparsers.add_parser('db_version')
|
parser = subparsers.add_parser('db_version')
|
||||||
parser.set_defaults(func=do_db_version)
|
parser.set_defaults(func=do_db_version)
|
||||||
|
|
||||||
|
# db_sync parser
|
||||||
parser = subparsers.add_parser('db_sync')
|
parser = subparsers.add_parser('db_sync')
|
||||||
parser.set_defaults(func=do_db_sync)
|
parser.set_defaults(func=do_db_sync)
|
||||||
|
# positional parameter, can be skipped. default=None
|
||||||
parser.add_argument('version', nargs='?')
|
parser.add_argument('version', nargs='?')
|
||||||
|
|
||||||
|
# purge_deleted parser
|
||||||
parser = subparsers.add_parser('purge_deleted')
|
parser = subparsers.add_parser('purge_deleted')
|
||||||
parser.set_defaults(func=purge_deleted)
|
parser.set_defaults(func=purge_deleted)
|
||||||
|
# positional parameter, can be skipped. default='90'
|
||||||
parser.add_argument('age', nargs='?', default='90',
|
parser.add_argument('age', nargs='?', default='90',
|
||||||
help=_('How long to preserve deleted data.'))
|
help=_('How long to preserve deleted data.'))
|
||||||
|
# optional parameter, can be skipped. default='days'
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'-g', '--granularity', default='days',
|
'-g', '--granularity', default='days',
|
||||||
choices=['days', 'hours', 'minutes', 'seconds'],
|
choices=['days', 'hours', 'minutes', 'seconds'],
|
||||||
help=_('Granularity to use for age argument, defaults to days.'))
|
help=_('Granularity to use for age argument, defaults to days.'))
|
||||||
|
|
||||||
|
# update_params parser
|
||||||
parser = subparsers.add_parser('update_params')
|
parser = subparsers.add_parser('update_params')
|
||||||
parser.set_defaults(func=do_crypt_parameters_and_properties)
|
parser.set_defaults(func=do_crypt_parameters_and_properties)
|
||||||
|
# positional parameter, can't be skipped
|
||||||
parser.add_argument('crypt_operation',
|
parser.add_argument('crypt_operation',
|
||||||
nargs='?',
|
|
||||||
choices=['encrypt', 'decrypt'],
|
choices=['encrypt', 'decrypt'],
|
||||||
help=_('Valid values are encrypt or decrypt. The '
|
help=_('Valid values are encrypt or decrypt. The '
|
||||||
'heat-engine processes must be stopped to use '
|
'heat-engine processes must be stopped to use '
|
||||||
'this.'))
|
'this.'))
|
||||||
|
# positional parameter, can be skipped. default=None
|
||||||
parser.add_argument('previous_encryption_key',
|
parser.add_argument('previous_encryption_key',
|
||||||
nargs='?',
|
nargs='?',
|
||||||
default=None,
|
default=None,
|
||||||
|
Loading…
Reference in New Issue
Block a user