Remove various deprecated options

These are all deprecated with at least one release and can be removed
now.

Change-Id: I5d11eda2a6b35de98f0484492f597a87df882013
Related-Bug: 1570593
This commit is contained in:
Stephen Finucane 2017-05-17 11:57:16 +01:00
parent b3e201a006
commit 3a76240124
4 changed files with 9 additions and 33 deletions

View File

@ -465,15 +465,6 @@ class OpenStackComputeShell(object):
default=utils.env('NOVA_SERVICE_NAME'),
help=_('Defaults to env[NOVA_SERVICE_NAME].'))
parser.add_argument(
'--volume-service-name',
action=DeprecatedAction,
metavar='<volume-service-name>',
default=utils.env('NOVA_VOLUME_SERVICE_NAME'),
use=_('This option will be removed after Nova 15.0.0 is '
'released.'),
help=argparse.SUPPRESS)
parser.add_argument(
'--os-endpoint-type',
metavar='<endpoint-type>',

View File

@ -1098,12 +1098,6 @@ class ShellTest(utils.TestCase):
self.run_command('flavor-access-list --flavor 2')
self.assert_called('GET', '/flavors/2/os-flavor-access')
def test_flavor_access_list_bad_filter(self):
cmd = 'flavor-access-list --flavor 2 --tenant proj2'
_out, err = self.run_command(cmd)
# assert the deprecation warning for using --tenant
self.assertIn('WARNING: Option "--tenant" is deprecated', err)
def test_flavor_access_list_no_filter(self):
cmd = 'flavor-access-list'
self.assertRaises(exceptions.CommandError, self.run_command, cmd)
@ -2719,8 +2713,7 @@ class ShellTest(utils.TestCase):
self.assert_called('GET', '/os-migrations')
def test_migration_list_with_filters(self):
self.run_command('migration-list --host host1 --cell_name child1 '
'--status finished')
self.run_command('migration-list --host host1 --status finished')
self.assert_called('GET',
'/os-migrations?host=host1&status=finished')

View File

@ -1175,13 +1175,6 @@ def do_flavor_key(cs, args):
'--flavor',
metavar='<flavor>',
help=_("Filter results by flavor name or ID."))
@utils.arg(
'--tenant', metavar='<tenant_id>',
help=_('Filter results by tenant ID.'),
action=shell.DeprecatedAction,
real_action='nothing',
use=_('this option is not supported, and will be '
'removed in version 5.0.0.'))
def do_flavor_access_list(cs, args):
"""Print access information about the given flavor."""
if args.flavor:
@ -4926,15 +4919,6 @@ def _print_migrations(cs, migrations):
dest='status',
metavar='<status>',
help=_('Fetch migrations for the given status.'))
@utils.arg(
'--cell_name',
dest='cell_name',
metavar='<cell_name>',
help=_('Fetch migrations for the given cell_name.'),
action=shell.DeprecatedAction,
real_action='nothing',
use=_('this option is not supported, and will be '
'removed after version 8.0.0.'))
def do_migration_list(cs, args):
"""Print a list of migrations."""
migrations = cs.migrations.list(args.host, args.status, None,

View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The following deprecated options have been removed:
- ``--tenant`` (from ``flavor access list``)
- ``--cell_name`` (from ``migration list``)
- ``--volume-service-name`` (global option)