Merge "Remove no use option parameters for template-validate"
This commit is contained in:
commit
1efc5199a4
|
@ -143,12 +143,6 @@ class ShellParamValidationTest(TestCase):
|
||||||
('stack-update', dict(
|
('stack-update', dict(
|
||||||
command='stack-update ts -P "a-b"',
|
command='stack-update ts -P "a-b"',
|
||||||
err='Malformed parameter')),
|
err='Malformed parameter')),
|
||||||
('validate', dict(
|
|
||||||
command='validate -P "a=b;c"',
|
|
||||||
err='Malformed parameter')),
|
|
||||||
('template-validate', dict(
|
|
||||||
command='template-validate -P "a$b"',
|
|
||||||
err='Malformed parameter')),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
|
|
@ -524,11 +524,6 @@ def do_template_show(hc, args):
|
||||||
help='Path to the environment.')
|
help='Path to the environment.')
|
||||||
@utils.arg('-o', '--template-object', metavar='<URL>',
|
@utils.arg('-o', '--template-object', metavar='<URL>',
|
||||||
help='URL to retrieve template object (e.g. from swift).')
|
help='URL to retrieve template object (e.g. from swift).')
|
||||||
@utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>',
|
|
||||||
help='Parameter values to validate. '
|
|
||||||
'This can be specified multiple times, or once with parameters '
|
|
||||||
'separated by a semicolon.',
|
|
||||||
action='append')
|
|
||||||
def do_validate(hc, args):
|
def do_validate(hc, args):
|
||||||
'''DEPRECATED! Use template-validate instead.'''
|
'''DEPRECATED! Use template-validate instead.'''
|
||||||
logger.warning('DEPRECATED! Use template-validate instead.')
|
logger.warning('DEPRECATED! Use template-validate instead.')
|
||||||
|
@ -543,11 +538,6 @@ def do_validate(hc, args):
|
||||||
help='Path to the environment.')
|
help='Path to the environment.')
|
||||||
@utils.arg('-o', '--template-object', metavar='<URL>',
|
@utils.arg('-o', '--template-object', metavar='<URL>',
|
||||||
help='URL to retrieve template object (e.g. from swift).')
|
help='URL to retrieve template object (e.g. from swift).')
|
||||||
@utils.arg('-P', '--parameters', metavar='<KEY1=VALUE1;KEY2=VALUE2...>',
|
|
||||||
help='Parameter values to validate. '
|
|
||||||
'This can be specified multiple times, or once with parameters '
|
|
||||||
'separated by a semicolon.',
|
|
||||||
action='append')
|
|
||||||
def do_template_validate(hc, args):
|
def do_template_validate(hc, args):
|
||||||
'''Validate a template with parameters.'''
|
'''Validate a template with parameters.'''
|
||||||
|
|
||||||
|
@ -560,7 +550,6 @@ def do_template_validate(hc, args):
|
||||||
env_files, env = template_utils.process_environment_and_files(
|
env_files, env = template_utils.process_environment_and_files(
|
||||||
env_path=args.environment_file)
|
env_path=args.environment_file)
|
||||||
fields = {
|
fields = {
|
||||||
'parameters': utils.format_parameters(args.parameters),
|
|
||||||
'template': template,
|
'template': template,
|
||||||
'files': dict(list(tpl_files.items()) + list(env_files.items())),
|
'files': dict(list(tpl_files.items()) + list(env_files.items())),
|
||||||
'environment': env
|
'environment': env
|
||||||
|
|
Loading…
Reference in New Issue