diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-06-13 14:48:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-06-13 14:48:22 +0000 |
| commit | 1efc5199a4baf9dc85d345ce51fda26527c693bf (patch) | |
| tree | 850d7f78ac8f903188f256764de4ebe54c4b8680 | |
| parent | 4f06861b18102c4b44f19a7180afb25c6d3c5c6d (diff) | |
| parent | 1039cd3a9883288abda18c5892c4ed98b7aa79a2 (diff) | |
| download | python-heatclient-1efc5199a4baf9dc85d345ce51fda26527c693bf.tar.gz | |
Merge "Remove no use option parameters for template-validate"
| -rw-r--r-- | heatclient/tests/test_shell.py | 6 | ||||
| -rw-r--r-- | heatclient/v1/shell.py | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py index 9c15241..0230da4 100644 --- a/heatclient/tests/test_shell.py +++ b/heatclient/tests/test_shell.py @@ -143,12 +143,6 @@ class ShellParamValidationTest(TestCase): ('stack-update', dict( command='stack-update ts -P "a-b"', 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): diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index 2dedbc4..82177e8 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -524,11 +524,6 @@ def do_template_show(hc, args): help='Path to the environment.') @utils.arg('-o', '--template-object', metavar='<URL>', 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): '''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.') @utils.arg('-o', '--template-object', metavar='<URL>', 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): '''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_path=args.environment_file) fields = { - 'parameters': utils.format_parameters(args.parameters), 'template': template, 'files': dict(list(tpl_files.items()) + list(env_files.items())), 'environment': env |