openstack/keystoneauth
Code Issues Proposed changes

Mark tenant-name and tenant-id deprecated

Browse Source 
In the generic password loader plugin, where you don't know if it's
tenant or project - we still want to indicate that tenant and in fact v2
are the wrong way to think about things anymore.

Change-Id: I7b3d9ba7937c20aa56ba8ade4460e49cf6f8524b
This commit is contained in:
Monty Taylor
2015-08-16 11:15:05 +09:00
parent dcea6b89ee
commit f82bb669c6
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystoneauth1/loading/_plugins/identity/generic.py
View File

@@ -23,10 +23,10 @@ class GenericBaseLoader(base.BaseIdentityLoader):
options.extend([
loading.Opt('domain-id', help='Domain ID to scope to'),
loading.Opt('domain-name', help='Domain name to scope to'),
loading.Opt('tenant-id', help='Tenant ID to scope to'),
loading.Opt('tenant-name', help='Tenant name to scope to'),
loading.Opt('project-id', help='Project ID to scope to'),
loading.Opt('project-name', help='Project name to scope to'),
loading.Opt('project-id', help='Project ID to scope to',
deprecated=[loading.Opt('tenant-id')]),
loading.Opt('project-name', help='Project name to scope to',
deprecated=[loading.Opt('tenant-name')]),
loading.Opt('project-domain-id',
help='Domain ID containing project'),
loading.Opt('project-domain-name',

2
keystoneauth1/tests/unit/auth/test_password.py
View File

@@ -52,8 +52,6 @@ class PasswordTests(utils.GenericPluginTestCase):
'domain-id',
'domain-name',
'tenant-id',
'tenant-name',
'project-id',
'project-name',
'project-domain-id',

2
keystoneauth1/tests/unit/auth/test_token.py
View File

@@ -36,8 +36,6 @@ class TokenTests(utils.GenericPluginTestCase):
allowed_opts = ['token',
'domain-id',
'domain-name',
'tenant-id',
'tenant-name',
'project-id',
'project-name',
'project-domain-id',