From 13bb2f74b0d65c1fef30f77d710d56e51e5f7841 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 19 Nov 2015 10:22:31 -0500
Subject: [PATCH] Swap the order of username deprecation

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
---
 keystoneclient/auth/identity/generic/password.py | 4 ++--
 keystoneclient/auth/identity/v2.py               | 4 ++--
 keystoneclient/auth/identity/v3/password.py      | 4 ++--
 keystoneclient/contrib/auth/v3/saml2.py          | 4 ++--
 keystoneclient/tests/unit/auth/test_password.py  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/keystoneclient/auth/identity/generic/password.py b/keystoneclient/auth/identity/generic/password.py
index f1c8aa66b..3c4180cb1 100644
--- a/keystoneclient/auth/identity/generic/password.py
+++ b/keystoneclient/auth/identity/generic/password.py
@@ -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"),
diff --git a/keystoneclient/auth/identity/v2.py b/keystoneclient/auth/identity/v2.py
index abe3e4c20..5de4527d4 100644
--- a/keystoneclient/auth/identity/v2.py
+++ b/keystoneclient/auth/identity/v2.py
@@ -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'),
diff --git a/keystoneclient/auth/identity/v3/password.py b/keystoneclient/auth/identity/v3/password.py
index 1184e802a..99094a1e2 100644
--- a/keystoneclient/auth/identity/v3/password.py
+++ b/keystoneclient/auth/identity/v3/password.py
@@ -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"),
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py
index 3a311d450..2e74996bd 100644
--- a/keystoneclient/contrib/auth/v3/saml2.py
+++ b/keystoneclient/contrib/auth/v3/saml2.py
@@ -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
diff --git a/keystoneclient/tests/unit/auth/test_password.py b/keystoneclient/tests/unit/auth/test_password.py
index 7926a22e8..020eb124c 100644
--- a/keystoneclient/tests/unit/auth/test_password.py
+++ b/keystoneclient/tests/unit/auth/test_password.py
@@ -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',