From 65a1c781d698a2f16f961d174cacb07d10a3c27b Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Wed, 25 Mar 2015 15:49:58 +0100 Subject: [PATCH] Remove the deprecated shell commands These have been deprecated for 2 years and the message was shown to the users for a year. Time to let them go. Change-Id: I139f1f471287b6553dfb4af0bd0b9ada8bdea390 --- heatclient/tests/test_shell.py | 6 -- heatclient/v1/shell.py | 161 --------------------------------- 2 files changed, 167 deletions(-) diff --git a/heatclient/tests/test_shell.py b/heatclient/tests/test_shell.py index 474d222e..4b4053d6 100644 --- a/heatclient/tests/test_shell.py +++ b/heatclient/tests/test_shell.py @@ -210,15 +210,9 @@ class EnvVarTestToken(TestCase): class ShellParamValidationTest(TestCase): scenarios = [ - ('create', dict( - command='create ts -P "a!b"', - err='Malformed parameter')), ('stack-create', dict( command='stack-create ts -P "ab"', err='Malformed parameter')), - ('update', dict( - command='update ts -P "a~b"', - err='Malformed parameter')), ('stack-update', dict( command='stack-update ts -P "a-b"', err='Malformed parameter')), diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py index bb3aa127..4e543747 100644 --- a/heatclient/v1/shell.py +++ b/heatclient/v1/shell.py @@ -45,48 +45,6 @@ def _authenticated_fetcher(hc): return _do -@utils.arg('-f', '--template-file', metavar='', - help=_('Path to the template.')) -@utils.arg('-e', '--environment-file', metavar='', - help=_('Path to the environment, it can be specified ' - 'multiple times.'), - action='append') -@utils.arg('-u', '--template-url', metavar='', - help=_('URL of template.')) -@utils.arg('-o', '--template-object', metavar='', - help=_('URL to retrieve template object (e.g. from swift).')) -@utils.arg('-c', '--create-timeout', metavar='', - type=int, - help=_('Stack creation timeout in minutes.' - ' DEPRECATED use %(arg)s instead.') - % {'arg': '--timeout'}) -@utils.arg('-t', '--timeout', metavar='', - type=int, - help=_('Stack creation timeout in minutes.')) -@utils.arg('-r', '--enable-rollback', default=False, action="store_true", - help=_('Enable rollback on create/update failure.')) -@utils.arg('-P', '--parameters', metavar='', - help=_('Parameter values used to create the stack. ' - 'This can be specified multiple times, or once with parameters ' - 'separated by a semicolon.'), - action='append') -@utils.arg('-Pf', '--parameter-file', metavar='', - help=_('Parameter values from file used to create the stack. ' - 'This can be specified multiple times. Parameter value ' - 'would be the content of the file'), - action='append') -@utils.arg('name', metavar='', - help=_('Name of the stack to create.')) -@utils.arg('--pre-create', metavar='', - default=None, action='append', - help=_('Name of a resource to set a pre-create hook to.')) -def do_create(hc, args): - '''DEPRECATED! Use stack-create instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'stack-create'}) - do_stack_create(hc, args) - - @utils.arg('-f', '--template-file', metavar='', help=_('Path to the template.')) @utils.arg('-e', '--environment-file', metavar='', @@ -318,15 +276,6 @@ def do_stack_preview(hc, args): utils.print_dict(stack.to_dict(), formatters=formatters) -@utils.arg('id', metavar='', nargs='+', - help=_('Name or ID of stack(s) to delete.')) -def do_delete(hc, args): - '''DEPRECATED! Use stack-delete instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'stack-delete '}) - do_stack_delete(hc, args) - - @utils.arg('id', metavar='', nargs='+', help=_('Name or ID of stack(s) to delete.')) def do_stack_delete(hc, args): @@ -416,15 +365,6 @@ def do_action_check(hc, args): do_stack_list(hc) -@utils.arg('id', metavar='', - help=_('Name or ID of stack to describe.')) -def do_describe(hc, args): - '''DEPRECATED! Use stack-show instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'stack-show'}) - do_stack_show(hc, args) - - @utils.arg('id', metavar='', help=_('Name or ID of stack to describe.')) def do_stack_show(hc, args): @@ -446,63 +386,6 @@ def do_stack_show(hc, args): utils.print_dict(stack.to_dict(), formatters=formatters) -@utils.arg('-f', '--template-file', metavar='', - help=_('Path to the template.')) -@utils.arg('-e', '--environment-file', metavar='', - help=_('Path to the environment, it can be specified ' - 'multiple times.'), - action='append') -@utils.arg('-u', '--template-url', metavar='', - help=_('URL of template.')) -@utils.arg('-o', '--template-object', metavar='', - help=_('URL to retrieve template object (e.g. from swift).')) -@utils.arg('-t', '--timeout', metavar='', - type=int, - help=_('Stack update timeout in minutes.')) -@utils.arg('-r', '--enable-rollback', default=False, action="store_true", - help=_('DEPRECATED! Use %(arg)s argument instead. ' - 'Enable rollback on stack update failure. ' - 'NOTE: default behavior is now to use the rollback value ' - 'of existing stack.') % {'arg': '--rollback'}) -@utils.arg('--rollback', default=None, metavar='', - help=_('Set rollback on update failure. ' - 'Values %(true)s set rollback to enabled. ' - 'Values %(false)s set rollback to disabled. ' - 'Default is to use the value of existing stack to be updated.') - % {'true': strutils.TRUE_STRINGS, 'false': strutils.FALSE_STRINGS}) -@utils.arg('-P', '--parameters', metavar='', - help=_('Parameter values used to create the stack. ' - 'This can be specified multiple times, or once with parameters ' - 'separated by a semicolon.'), - action='append') -@utils.arg('-Pf', '--parameter-file', metavar='', - help=_('Parameter values from file used to create the stack. ' - 'This can be specified multiple times. Parameter value ' - 'would be the content of the file'), - action='append') -@utils.arg('-x', '--existing', default=False, action="store_true", - help=_('Re-use the set of parameters of the current stack. ' - 'Parameters specified in %(arg)s will patch over the existing ' - 'values in the current stack. Parameters omitted will keep ' - 'the existing values.') - % {'arg': '--parameters'}) -@utils.arg('-c', '--clear-parameter', metavar='', - help=_('Remove the parameters from the set of parameters of ' - 'current stack for the stack-update. The default value in the ' - 'template will be used. This can be specified multiple times.'), - action='append') -@utils.arg('id', metavar='', - help=_('Name or ID of stack to update.')) -@utils.arg('--pre-update', metavar='', - default=None, action='append', - help=_('Name of a resource to set a pre-update hook to.')) -def do_update(hc, args): - '''DEPRECATED! Use stack-update instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'stack-update'}) - do_stack_update(hc, args) - - @utils.arg('-f', '--template-file', metavar='', help=_('Path to the template.')) @utils.arg('-e', '--environment-file', metavar='', @@ -622,13 +505,6 @@ def do_stack_cancel_update(hc, args): do_stack_list(hc) -def do_list(hc, args): - '''DEPRECATED! Use stack-list instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'stack-list'}) - do_stack_list(hc) - - @utils.arg('-s', '--show-deleted', default=False, action="store_true", help=_('Include soft-deleted stacks in the stack listing.')) @utils.arg('-n', '--show-nested', default=False, action="store_true", @@ -772,15 +648,6 @@ def do_resource_type_template(hc, args): print(utils.format_output(template)) -@utils.arg('id', metavar='', - help=_('Name or ID of stack to get the template for.')) -def do_gettemplate(hc, args): - '''DEPRECATED! Use template-show instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'template-show'}) - do_template_show(hc, args) - - @utils.arg('id', metavar='', help=_('Name or ID of stack to get the template for.')) def do_template_show(hc, args): @@ -797,23 +664,6 @@ def do_template_show(hc, args): print(jsonutils.dumps(template, indent=2, ensure_ascii=False)) -@utils.arg('-u', '--template-url', metavar='', - help=_('URL of template.')) -@utils.arg('-f', '--template-file', metavar='', - help=_('Path to the template.')) -@utils.arg('-e', '--environment-file', metavar='', - help=_('Path to the environment, it can be specified ' - 'multiple times.'), - action='append') -@utils.arg('-o', '--template-object', metavar='', - help=_('URL to retrieve template object (e.g. from swift).')) -def do_validate(hc, args): - '''DEPRECATED! Use template-validate instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'template-validate'}) - do_template_validate(hc, args) - - @utils.arg('-u', '--template-url', metavar='', help=_('URL of template.')) @utils.arg('-f', '--template-file', metavar='', @@ -873,17 +723,6 @@ def do_resource_list(hc, args): utils.print_list(resources, fields, sortby_index=4) -@utils.arg('id', metavar='', - help=_('Name or ID of stack to show the resource for.')) -@utils.arg('resource', metavar='', - help=_('Name of the resource to show the details for.')) -def do_resource(hc, args): - '''DEPRECATED! Use resource-show instead.''' - logger.warning(_LW('DEPRECATED! Use %(cmd)s instead.'), - {'cmd': 'resource-show'}) - do_resource_show(hc, args) - - @utils.arg('id', metavar='', help=_('Name or ID of stack to show the resource for.')) @utils.arg('resource', metavar='',