Remove deprecated options

Remove the following deprecated options.

* --endpoint-override
* --instance-name ('nova list' command)

Change-Id: Ic6a78f04a98c1616750e6ecd6225f2750c214dd7
This commit is contained in:
Takashi NATSUME 2019-03-11 11:07:36 +09:00
parent a4ea27fa3b
commit a7ea3fb09b
4 changed files with 11 additions and 37 deletions

View File

@ -2187,10 +2187,10 @@ nova list
usage: nova list [--reservation-id <reservation-id>] [--ip <ip-regexp>] usage: nova list [--reservation-id <reservation-id>] [--ip <ip-regexp>]
[--ip6 <ip6-regexp>] [--name <name-regexp>] [--ip6 <ip6-regexp>] [--name <name-regexp>]
[--instance-name <name-regexp>] [--status <status>] [--status <status>] [--flavor <flavor>] [--image <image>]
[--flavor <flavor>] [--image <image>] [--host <hostname>] [--host <hostname>] [--all-tenants [<0|1>]]
[--all-tenants [<0|1>]] [--tenant [<tenant>]] [--tenant [<tenant>]] [--user [<user>]] [--deleted]
[--user [<user>]] [--deleted] [--fields <fields>] [--minimal] [--fields <fields>] [--minimal]
[--sort <key>[:<direction>]] [--marker <marker>] [--sort <key>[:<direction>]] [--marker <marker>]
[--limit <limit>] [--changes-since <changes_since>] [--limit <limit>] [--changes-since <changes_since>]
[--changes-before <changes_before>] [--changes-before <changes_before>]
@ -2219,10 +2219,6 @@ present in the failure domain.
``--name <name-regexp>`` ``--name <name-regexp>``
Search with regular expression match by name. Search with regular expression match by name.
``--instance-name <name-regexp>``
Search with regular expression match by server
name.
``--status <status>`` ``--status <status>``
Search by server status. Search by server status.

View File

@ -367,26 +367,6 @@ class OpenStackComputeShell(object):
help=_("Use this API endpoint instead of the Service Catalog. " help=_("Use this API endpoint instead of the Service Catalog. "
"Defaults to env[OS_ENDPOINT_OVERRIDE].")) "Defaults to env[OS_ENDPOINT_OVERRIDE]."))
# NOTE(takashin): This dummy '--end' argument was added
# to avoid misinterpreting command line arguments.
# If there is not this dummy argument, the '--end' is interpreted to
# the '--endpoint-override'.
# TODO(takashin): Remove this dummy '--end' argument
# when the deprecated '--endpoint-override' argument is removed.
parser.add_argument(
'--end',
metavar='<end>',
nargs='?',
help=argparse.SUPPRESS)
parser.add_argument(
'--endpoint-override',
action=DeprecatedAction,
use=_('use "%s"; this option will be removed after Rocky '
'OpenStack release.') % '--os-endpoint-override',
dest='endpoint_override',
help=argparse.SUPPRESS)
if osprofiler_profiler: if osprofiler_profiler:
parser.add_argument('--profile', parser.add_argument('--profile',
metavar='HMAC_KEY', metavar='HMAC_KEY',

View File

@ -1418,14 +1418,6 @@ def _print_flavor(flavor):
metavar='<name-regexp>', metavar='<name-regexp>',
default=None, default=None,
help=_('Search with regular expression match by name.')) help=_('Search with regular expression match by name.'))
@utils.arg(
'--instance-name',
dest='instance_name',
metavar='<name-regexp>',
default=None,
action=shell.DeprecatedAction,
help=_('Search with regular expression match by server name. The option '
'is not used and will be removed in T release.'))
@utils.arg( @utils.arg(
'--status', '--status',
dest='status', dest='status',
@ -1596,7 +1588,6 @@ def do_list(cs, args):
'user_id': args.user, 'user_id': args.user,
'host': args.host, 'host': args.host,
'deleted': args.deleted, 'deleted': args.deleted,
'instance_name': args.instance_name,
'changes-since': args.changes_since} 'changes-since': args.changes_since}
for arg in ('tags', "tags-any", 'not-tags', 'not-tags-any'): for arg in ('tags', "tags-any", 'not-tags', 'not-tags-any'):

View File

@ -0,0 +1,7 @@
---
upgrade:
- |
The following deprecated options have been removed.
* ``--endpoint-override`` (Authentication option)
* ``--instance-name`` (``nova list`` command)