Merge "identity: use set() for valid_options"

openstack/auth/identity/discoverable.py

@@ -39,10 +39,10 @@ from openstack import exceptions
 class Auth(base.BaseIdentityPlugin):
 
     #: Valid options for this plugin
-    valid_options = list(set(v2.Password.valid_options +
-                             v2.Token.valid_options +
-                             v3.Password.valid_options +
-                             v3.Token.valid_options))
+    valid_options = set(list(v3.Password.valid_options)
+                        + list(v3.Token.valid_options)
+                        + list(v2.Password.valid_options)
+                        + list(v2.Token.valid_options))
 
     def __init__(self, auth_url=None, **auth_args):
         """Construct an Identity Authentication Plugin.

openstack/auth/identity/v2.py

@@ -112,7 +112,7 @@ _NOT_PASSED = object()
 class Password(Auth):
 
     #: Valid options for Password plugin
-    valid_options = [
+    valid_options = {
         'access_info',
         'auth_url',
         'username',
@@ -124,7 +124,7 @@ class Password(Auth):
         'tenant_id',
         'reauthenticate',
         'trust_id',
-    ]
+    }
 
     def __init__(self, auth_url, username=_NOT_PASSED, password=None,
                  user_id=_NOT_PASSED, **kwargs):
@@ -167,7 +167,7 @@ class Password(Auth):
 class Token(Auth):
 
     #: Valid options for this plugin
-    valid_options = [
+    valid_options = {
         'access_info',
         'auth_url',
         'project_id',
@@ -177,7 +177,7 @@ class Token(Auth):
         'reauthenticate',
         'token',
         'trust_id',
-    ]
+    }
 
     def __init__(self, auth_url, token, **kwargs):
         """A plugin for authenticating with an existing token.

openstack/auth/identity/v3.py

@@ -250,7 +250,7 @@ class PasswordMethod(AuthMethod):
 class Password(AuthConstructor):
 
     #: Valid options for this plugin
-    valid_options = [
+    valid_options = {
         'access_info',
         'auth_url',
         'domain_id',
@@ -266,7 +266,7 @@ class Password(AuthConstructor):
         'user_domain_name',
         'user_id',
         'username',
-    ]
+    }
 
     _auth_method_class = PasswordMethod
 
@@ -292,7 +292,7 @@ class TokenMethod(AuthMethod):
 class Token(AuthConstructor):
 
     #: Valid options for this plugin
-    valid_options = [
+    valid_options = {
         'access_info',
         'auth_url',
         'domain_id',
@@ -306,7 +306,7 @@ class Token(AuthConstructor):
         'trust_id',
         'user_domain_id',
         'user_domain_name',
-    ]
+    }
 
     _auth_method_class = TokenMethod
 

openstack/tests/auth/identity/test_discoverable.py

@@ -20,7 +20,7 @@ from openstack.tests.auth import common
 
 class TestDiscoverableAuth(testtools.TestCase):
     def test_valid_options(self):
-        expected = [
+        expected = {
             'access_info',
             'auth_url',
             'domain_id',
@@ -39,8 +39,8 @@ class TestDiscoverableAuth(testtools.TestCase):
             'user_domain_name',
             'user_id',
             'username',
-        ]
-        self.assertEqual(expected, sorted(discoverable.Auth.valid_options))
+        }
+        self.assertEqual(expected, discoverable.Auth.valid_options)
 
     def test_create2(self):
         auth_args = {