Merge "Trivial: Reorder classes in identity v3 in alphabetical order"

6 files changed, 217 insertions, 217 deletions

diff --git a/openstackclient/tests/identity/v3/test_consumer.py b/openstackclient/tests/identity/v3/test_consumer.py
index 4d15d5d8..4a8cf087 100644
--- a/openstackclient/tests/identity/v3/test_consumer.py
+++ b/openstackclient/tests/identity/v3/test_consumer.py
@@ -136,45 +136,6 @@ class TestConsumerList(TestOAuth1):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestConsumerShow(TestOAuth1):
-
-    def setUp(self):
-        super(TestConsumerShow, self).setUp()
-
-        consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
-        del consumer_no_secret['secret']
-        self.consumers_mock.get.return_value = fakes.FakeResource(
-            None,
-            consumer_no_secret,
-            loaded=True,
-        )
-
-        # Get the command object to test
-        self.cmd = consumer.ShowConsumer(self.app, None)
-
-    def test_consumer_show(self):
-        arglist = [
-            identity_fakes.consumer_id,
-        ]
-        verifylist = [
-            ('consumer', identity_fakes.consumer_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.consumers_mock.get.assert_called_with(
-            identity_fakes.consumer_id,
-        )
-
-        collist = ('description', 'id')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.consumer_description,
-            identity_fakes.consumer_id,
-        )
-        self.assertEqual(datalist, data)
-
-
 class TestConsumerSet(TestOAuth1):
 
     def setUp(self):
@@ -217,3 +178,42 @@ class TestConsumerSet(TestOAuth1):
             **kwargs
         )
         self.assertIsNone(result)
+
+
+class TestConsumerShow(TestOAuth1):
+
+    def setUp(self):
+        super(TestConsumerShow, self).setUp()
+
+        consumer_no_secret = copy.deepcopy(identity_fakes.OAUTH_CONSUMER)
+        del consumer_no_secret['secret']
+        self.consumers_mock.get.return_value = fakes.FakeResource(
+            None,
+            consumer_no_secret,
+            loaded=True,
+        )
+
+        # Get the command object to test
+        self.cmd = consumer.ShowConsumer(self.app, None)
+
+    def test_consumer_show(self):
+        arglist = [
+            identity_fakes.consumer_id,
+        ]
+        verifylist = [
+            ('consumer', identity_fakes.consumer_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.consumers_mock.get.assert_called_with(
+            identity_fakes.consumer_id,
+        )
+
+        collist = ('description', 'id')
+        self.assertEqual(collist, columns)
+        datalist = (
+            identity_fakes.consumer_description,
+            identity_fakes.consumer_id,
+        )
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index 1ee7aade..465e79ba 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -310,46 +310,6 @@ class TestIdentityProviderList(TestIdentityProvider):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestIdentityProviderShow(TestIdentityProvider):
-
-    def setUp(self):
-        super(TestIdentityProviderShow, self).setUp()
-
-        ret = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
-            loaded=True,
-        )
-        self.identity_providers_mock.get.return_value = ret
-        # Get the command object to test
-        self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
-
-    def test_identity_provider_show(self):
-        arglist = [
-            identity_fakes.idp_id,
-        ]
-        verifylist = [
-            ('identity_provider', identity_fakes.idp_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.identity_providers_mock.get.assert_called_with(
-            identity_fakes.idp_id,
-        )
-
-        collist = ('description', 'enabled', 'id', 'remote_ids')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.idp_description,
-            True,
-            identity_fakes.idp_id,
-            identity_fakes.formatted_idp_remote_ids
-        )
-        self.assertEqual(datalist, data)
-
-
 class TestIdentityProviderSet(TestIdentityProvider):
 
     columns = (
@@ -627,3 +587,43 @@ class TestIdentityProviderSet(TestIdentityProvider):
         # neither --enable nor --disable was specified
         self.assertIsNone(columns)
         self.assertIsNone(data)
+
+
+class TestIdentityProviderShow(TestIdentityProvider):
+
+    def setUp(self):
+        super(TestIdentityProviderShow, self).setUp()
+
+        ret = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
+            loaded=True,
+        )
+        self.identity_providers_mock.get.return_value = ret
+        # Get the command object to test
+        self.cmd = identity_provider.ShowIdentityProvider(self.app, None)
+
+    def test_identity_provider_show(self):
+        arglist = [
+            identity_fakes.idp_id,
+        ]
+        verifylist = [
+            ('identity_provider', identity_fakes.idp_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.identity_providers_mock.get.assert_called_with(
+            identity_fakes.idp_id,
+        )
+
+        collist = ('description', 'enabled', 'id', 'remote_ids')
+        self.assertEqual(collist, columns)
+        datalist = (
+            identity_fakes.idp_description,
+            True,
+            identity_fakes.idp_id,
+            identity_fakes.formatted_idp_remote_ids
+        )
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index 106a419c..b9e3b1d5 100644
--- a/openstackclient/tests/identity/v3/test_mappings.py
+++ b/openstackclient/tests/identity/v3/test_mappings.py
@@ -145,41 +145,6 @@ class TestMappingList(TestMapping):
         self.assertEqual(datalist, data)
 
 
-class TestMappingShow(TestMapping):
-
-    def setUp(self):
-        super(TestMappingShow, self).setUp()
-
-        self.mapping_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
-            loaded=True
-        )
-
-        self.cmd = mapping.ShowMapping(self.app, None)
-
-    def test_mapping_show(self):
-        arglist = [
-            identity_fakes.mapping_id
-        ]
-        verifylist = [
-            ('mapping', identity_fakes.mapping_id)
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.mapping_mock.get.assert_called_with(
-            identity_fakes.mapping_id)
-
-        collist = ('id', 'rules')
-        self.assertEqual(collist, columns)
-
-        datalist = (identity_fakes.mapping_id,
-                    identity_fakes.MAPPING_RULES)
-        self.assertEqual(datalist, data)
-
-
 class TestMappingSet(TestMapping):
 
     def setUp(self):
@@ -242,3 +207,38 @@ class TestMappingSet(TestMapping):
             exceptions.CommandError,
             self.cmd.take_action,
             parsed_args)
+
+
+class TestMappingShow(TestMapping):
+
+    def setUp(self):
+        super(TestMappingShow, self).setUp()
+
+        self.mapping_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+            loaded=True
+        )
+
+        self.cmd = mapping.ShowMapping(self.app, None)
+
+    def test_mapping_show(self):
+        arglist = [
+            identity_fakes.mapping_id
+        ]
+        verifylist = [
+            ('mapping', identity_fakes.mapping_id)
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.mapping_mock.get.assert_called_with(
+            identity_fakes.mapping_id)
+
+        collist = ('id', 'rules')
+        self.assertEqual(collist, columns)
+
+        datalist = (identity_fakes.mapping_id,
+                    identity_fakes.MAPPING_RULES)
+        self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_oauth.py b/openstackclient/tests/identity/v3/test_oauth.py
index dba6d034..d3cf3655 100644
--- a/openstackclient/tests/identity/v3/test_oauth.py
+++ b/openstackclient/tests/identity/v3/test_oauth.py
@@ -32,52 +32,52 @@ class TestOAuth1(identity_fakes.TestOAuth1):
         self.roles_mock.reset_mock()
 
 
-class TestRequestTokenCreate(TestOAuth1):
+class TestAccessTokenCreate(TestOAuth1):
 
     def setUp(self):
-        super(TestRequestTokenCreate, self).setUp()
-
-        self.request_tokens_mock.create.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.OAUTH_REQUEST_TOKEN),
-            loaded=True,
-        )
+        super(TestAccessTokenCreate, self).setUp()
 
-        self.projects_mock.get.return_value = fakes.FakeResource(
+        self.access_tokens_mock.create.return_value = fakes.FakeResource(
             None,
-            copy.deepcopy(identity_fakes.PROJECT),
+            copy.deepcopy(identity_fakes.OAUTH_ACCESS_TOKEN),
             loaded=True,
         )
 
-        self.cmd = token.CreateRequestToken(self.app, None)
+        self.cmd = token.CreateAccessToken(self.app, None)
 
-    def test_create_request_tokens(self):
+    def test_create_access_tokens(self):
         arglist = [
             '--consumer-key', identity_fakes.consumer_id,
             '--consumer-secret', identity_fakes.consumer_secret,
-            '--project', identity_fakes.project_id,
+            '--request-key', identity_fakes.request_token_id,
+            '--request-secret', identity_fakes.request_token_secret,
+            '--verifier', identity_fakes.oauth_verifier_pin,
         ]
         verifylist = [
             ('consumer_key', identity_fakes.consumer_id),
             ('consumer_secret', identity_fakes.consumer_secret),
-            ('project', identity_fakes.project_id),
+            ('request_key', identity_fakes.request_token_id),
+            ('request_secret', identity_fakes.request_token_secret),
+            ('verifier', identity_fakes.oauth_verifier_pin),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.request_tokens_mock.create.assert_called_with(
+        self.access_tokens_mock.create.assert_called_with(
             identity_fakes.consumer_id,
             identity_fakes.consumer_secret,
-            identity_fakes.project_id,
+            identity_fakes.request_token_id,
+            identity_fakes.request_token_secret,
+            identity_fakes.oauth_verifier_pin,
         )
 
         collist = ('expires', 'id', 'key', 'secret')
         self.assertEqual(collist, columns)
         datalist = (
-            identity_fakes.request_token_expires,
-            identity_fakes.request_token_id,
-            identity_fakes.request_token_id,
-            identity_fakes.request_token_secret,
+            identity_fakes.access_token_expires,
+            identity_fakes.access_token_id,
+            identity_fakes.access_token_id,
+            identity_fakes.access_token_secret,
         )
         self.assertEqual(datalist, data)
 
@@ -123,51 +123,51 @@ class TestRequestTokenAuthorize(TestOAuth1):
         self.assertEqual(datalist, data)
 
 
-class TestAccessTokenCreate(TestOAuth1):
+class TestRequestTokenCreate(TestOAuth1):
 
     def setUp(self):
-        super(TestAccessTokenCreate, self).setUp()
+        super(TestRequestTokenCreate, self).setUp()
 
-        self.access_tokens_mock.create.return_value = fakes.FakeResource(
+        self.request_tokens_mock.create.return_value = fakes.FakeResource(
             None,
-            copy.deepcopy(identity_fakes.OAUTH_ACCESS_TOKEN),
+            copy.deepcopy(identity_fakes.OAUTH_REQUEST_TOKEN),
             loaded=True,
         )
 
-        self.cmd = token.CreateAccessToken(self.app, None)
+        self.projects_mock.get.return_value = fakes.FakeResource(
+            None,
+            copy.deepcopy(identity_fakes.PROJECT),
+            loaded=True,
+        )
 
-    def test_create_access_tokens(self):
+        self.cmd = token.CreateRequestToken(self.app, None)
+
+    def test_create_request_tokens(self):
         arglist = [
             '--consumer-key', identity_fakes.consumer_id,
             '--consumer-secret', identity_fakes.consumer_secret,
-            '--request-key', identity_fakes.request_token_id,
-            '--request-secret', identity_fakes.request_token_secret,
-            '--verifier', identity_fakes.oauth_verifier_pin,
+            '--project', identity_fakes.project_id,
         ]
         verifylist = [
             ('consumer_key', identity_fakes.consumer_id),
             ('consumer_secret', identity_fakes.consumer_secret),
-            ('request_key', identity_fakes.request_token_id),
-            ('request_secret', identity_fakes.request_token_secret),
-            ('verifier', identity_fakes.oauth_verifier_pin),
+            ('project', identity_fakes.project_id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.access_tokens_mock.create.assert_called_with(
+        self.request_tokens_mock.create.assert_called_with(
             identity_fakes.consumer_id,
             identity_fakes.consumer_secret,
-            identity_fakes.request_token_id,
-            identity_fakes.request_token_secret,
-            identity_fakes.oauth_verifier_pin,
+            identity_fakes.project_id,
         )
 
         collist = ('expires', 'id', 'key', 'secret')
         self.assertEqual(collist, columns)
         datalist = (
-            identity_fakes.access_token_expires,
-            identity_fakes.access_token_id,
-            identity_fakes.access_token_id,
-            identity_fakes.access_token_secret,
+            identity_fakes.request_token_expires,
+            identity_fakes.request_token_id,
+            identity_fakes.request_token_id,
+            identity_fakes.request_token_secret,
         )
         self.assertEqual(datalist, data)
diff --git a/openstackclient/tests/identity/v3/test_service_provider.py b/openstackclient/tests/identity/v3/test_service_provider.py
index b1285b10..80d60c5a 100644
--- a/openstackclient/tests/identity/v3/test_service_provider.py
+++ b/openstackclient/tests/identity/v3/test_service_provider.py
@@ -241,47 +241,6 @@ class TestServiceProviderList(TestServiceProvider):
         self.assertEqual(tuple(data), datalist)
 
 
-class TestServiceProviderShow(TestServiceProvider):
-
-    def setUp(self):
-        super(TestServiceProviderShow, self).setUp()
-
-        ret = fakes.FakeResource(
-            None,
-            copy.deepcopy(service_fakes.SERVICE_PROVIDER),
-            loaded=True,
-        )
-        self.service_providers_mock.get.return_value = ret
-        # Get the command object to test
-        self.cmd = service_provider.ShowServiceProvider(self.app, None)
-
-    def test_service_provider_show(self):
-        arglist = [
-            service_fakes.sp_id,
-        ]
-        verifylist = [
-            ('service_provider', service_fakes.sp_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.service_providers_mock.get.assert_called_with(
-            service_fakes.sp_id,
-        )
-
-        collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')
-        self.assertEqual(collist, columns)
-        datalist = (
-            service_fakes.sp_auth_url,
-            service_fakes.sp_description,
-            True,
-            service_fakes.sp_id,
-            service_fakes.service_provider_url
-        )
-        self.assertEqual(data, datalist)
-
-
 class TestServiceProviderSet(TestServiceProvider):
 
     columns = (
@@ -420,3 +379,44 @@ class TestServiceProviderSet(TestServiceProvider):
         # was set.
         self.assertIsNone(columns)
         self.assertIsNone(data)
+
+
+class TestServiceProviderShow(TestServiceProvider):
+
+    def setUp(self):
+        super(TestServiceProviderShow, self).setUp()
+
+        ret = fakes.FakeResource(
+            None,
+            copy.deepcopy(service_fakes.SERVICE_PROVIDER),
+            loaded=True,
+        )
+        self.service_providers_mock.get.return_value = ret
+        # Get the command object to test
+        self.cmd = service_provider.ShowServiceProvider(self.app, None)
+
+    def test_service_provider_show(self):
+        arglist = [
+            service_fakes.sp_id,
+        ]
+        verifylist = [
+            ('service_provider', service_fakes.sp_id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.service_providers_mock.get.assert_called_with(
+            service_fakes.sp_id,
+        )
+
+        collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url')
+        self.assertEqual(collist, columns)
+        datalist = (
+            service_fakes.sp_auth_url,
+            service_fakes.sp_description,
+            True,
+            service_fakes.sp_id,
+            service_fakes.service_provider_url
+        )
+        self.assertEqual(data, datalist)
diff --git a/openstackclient/tests/identity/v3/test_unscoped_saml.py b/openstackclient/tests/identity/v3/test_unscoped_saml.py
index c2f14493..d12cb454 100644
--- a/openstackclient/tests/identity/v3/test_unscoped_saml.py
+++ b/openstackclient/tests/identity/v3/test_unscoped_saml.py
@@ -30,23 +30,23 @@ class TestUnscopedSAML(identity_fakes.TestFederatedIdentity):
         self.domains_mock.reset_mock()
 
 
-class TestProjectList(TestUnscopedSAML):
+class TestDomainList(TestUnscopedSAML):
 
     def setUp(self):
-        super(TestProjectList, self).setUp()
+        super(TestDomainList, self).setUp()
 
-        self.projects_mock.list.return_value = [
+        self.domains_mock.list.return_value = [
             fakes.FakeResource(
                 None,
-                copy.deepcopy(identity_fakes.PROJECT),
+                copy.deepcopy(identity_fakes.DOMAIN),
                 loaded=True,
             ),
         ]
 
         # Get the command object to test
-        self.cmd = unscoped_saml.ListAccessibleProjects(self.app, None)
+        self.cmd = unscoped_saml.ListAccessibleDomains(self.app, None)
 
-    def test_accessible_projects_list(self):
+    def test_accessible_domains_list(self):
         self.app.client_manager.auth_plugin_name = 'v3unscopedsaml'
         arglist = []
         verifylist = []
@@ -57,19 +57,19 @@ class TestProjectList(TestUnscopedSAML):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.projects_mock.list.assert_called_with()
+        self.domains_mock.list.assert_called_with()
 
-        collist = ('ID', 'Domain ID', 'Enabled', 'Name')
+        collist = ('ID', 'Enabled', 'Name', 'Description')
         self.assertEqual(collist, columns)
         datalist = ((
-            identity_fakes.project_id,
             identity_fakes.domain_id,
             True,
-            identity_fakes.project_name,
+            identity_fakes.domain_name,
+            identity_fakes.domain_description,
         ), )
         self.assertEqual(datalist, tuple(data))
 
-    def test_accessible_projects_list_wrong_auth(self):
+    def test_accessible_domains_list_wrong_auth(self):
         auth = identity_fakes.FakeAuth("wrong auth")
         self.app.client_manager.identity.session.auth = auth
         arglist = []
@@ -81,23 +81,23 @@ class TestProjectList(TestUnscopedSAML):
                           parsed_args)
 
 
-class TestDomainList(TestUnscopedSAML):
+class TestProjectList(TestUnscopedSAML):
 
     def setUp(self):
-        super(TestDomainList, self).setUp()
+        super(TestProjectList, self).setUp()
 
-        self.domains_mock.list.return_value = [
+        self.projects_mock.list.return_value = [
             fakes.FakeResource(
                 None,
-                copy.deepcopy(identity_fakes.DOMAIN),
+                copy.deepcopy(identity_fakes.PROJECT),
                 loaded=True,
             ),
         ]
 
         # Get the command object to test
-        self.cmd = unscoped_saml.ListAccessibleDomains(self.app, None)
+        self.cmd = unscoped_saml.ListAccessibleProjects(self.app, None)
 
-    def test_accessible_domains_list(self):
+    def test_accessible_projects_list(self):
         self.app.client_manager.auth_plugin_name = 'v3unscopedsaml'
         arglist = []
         verifylist = []
@@ -108,19 +108,19 @@ class TestDomainList(TestUnscopedSAML):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.domains_mock.list.assert_called_with()
+        self.projects_mock.list.assert_called_with()
 
-        collist = ('ID', 'Enabled', 'Name', 'Description')
+        collist = ('ID', 'Domain ID', 'Enabled', 'Name')
         self.assertEqual(collist, columns)
         datalist = ((
+            identity_fakes.project_id,
             identity_fakes.domain_id,
             True,
-            identity_fakes.domain_name,
-            identity_fakes.domain_description,
+            identity_fakes.project_name,
         ), )
         self.assertEqual(datalist, tuple(data))
 
-    def test_accessible_domains_list_wrong_auth(self):
+    def test_accessible_projects_list_wrong_auth(self):
         auth = identity_fakes.FakeAuth("wrong auth")
         self.app.client_manager.identity.session.auth = auth
         arglist = []