openstack/python-keystoneclient
Code Issues Proposed changes

Swap the order of username deprecation

Browse Source 
The attempt at a move to user-name is an exercise in churn, and is
filling everyone's logs with admonitions to change the name of their
variables - which does not work if they do. Swap this, effectively
reverting the attempt at a move. user-name will continue to work on
the off chance anyone started consuming that path, which is unlikely
because none of the consuming programs expose that as an actual option.

Closes-Bug: 1498247

Change-Id: I62d991fda1df63c9cbabfde2f6836bc031f5147c
This commit is contained in:
Monty Taylor 2015-11-19 10:22:31 -05:00 committed by Steve Martinelli
parent 4a070903d2
commit 13bb2f74b0
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/auth/identity/generic/password.py
View File

@ -26,8 +26,8 @@ LOG = logging.getLogger(__name__)
def get_options():
return [
cfg.StrOpt('user-id', help='User id'),
cfg.StrOpt('user-name', dest='username', help='Username',
deprecated_name='username'),
cfg.StrOpt('username', dest='username', help='Username',
deprecated_name='user-name'),
cfg.StrOpt('user-domain-id', help="User's domain id"),
cfg.StrOpt('user-domain-name', help="User's domain name"),
cfg.StrOpt('password', help="User's password"),

4
keystoneclient/auth/identity/v2.py
View File

@ -188,9 +188,9 @@ class Password(Auth):
options = super(Password, cls).get_options()
options.extend([
cfg.StrOpt('user-name',
cfg.StrOpt('username',
dest='username',
deprecated_name='username',
deprecated_name='user-name',
help='Username to login with'),
cfg.StrOpt('user-id', help='User ID to login with'),
cfg.StrOpt('password', secret=True, help='Password to use'),

4
keystoneclient/auth/identity/v3/password.py
View File

@ -79,8 +79,8 @@ class Password(base.AuthConstructor):
options.extend([
cfg.StrOpt('user-id', help='User ID'),
cfg.StrOpt('user-name', dest='username', help='Username',
deprecated_name='username'),
cfg.StrOpt('username', dest='username', help='Username',
deprecated_name='user-name'),
cfg.StrOpt('user-domain-id', help="User's domain id"),
cfg.StrOpt('user-domain-name', help="User's domain name"),
cfg.StrOpt('password', secret=True, help="User's password"),

4
keystoneclient/contrib/auth/v3/saml2.py
View File

@ -72,8 +72,8 @@ class _BaseSAMLPlugin(v3.AuthConstructor):
cfg.StrOpt('identity-provider', help="Identity Provider's name"),
cfg.StrOpt('identity-provider-url',
help="Identity Provider's URL"),
cfg.StrOpt('user-name', dest='username', help='Username',
deprecated_name='username'),
cfg.StrOpt('username', dest='username', help='Username',
deprecated_name='user-name'),
cfg.StrOpt('password', help='Password')
])
return options

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

@ -46,7 +46,7 @@ class PasswordTests(utils.GenericPluginTestCase):
def test_options(self):
opts = [o.name for o in self.PLUGIN_CLASS.get_options()]
allowed_opts = ['user-name',
allowed_opts = ['username',
'user-domain-id',
'user-domain-name',
'user-id',