Merge "Fix IDP commands"

2 files changed, 14 insertions, 10 deletions

diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 8143409d..60417157 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -201,14 +201,18 @@ class FakeIdentityv3Client(object):
         self.management_url = kwargs['endpoint']
 
 
-class FakeFederatedClient(FakeIdentityv3Client):
+class FakeFederationManager(object):
     def __init__(self, **kwargs):
-        super(FakeFederatedClient, self).__init__(**kwargs)
-
         self.identity_providers = mock.Mock()
         self.identity_providers.resource_class = fakes.FakeResource(None, {})
 
 
+class FakeFederatedClient(FakeIdentityv3Client):
+    def __init__(self, **kwargs):
+        super(FakeFederatedClient, self).__init__(**kwargs)
+        self.federation = FakeFederationManager()
+
+
 class FakeOAuth1Client(FakeIdentityv3Client):
     def __init__(self, **kwargs):
         super(FakeOAuth1Client, self).__init__(**kwargs)
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index 280d9227..c74bce8e 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -24,8 +24,8 @@ class TestIdentityProvider(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super(TestIdentityProvider, self).setUp()
 
-        identity_lib = self.app.client_manager.identity
-        self.identity_providers_mock = identity_lib.identity_providers
+        federation_lib = self.app.client_manager.identity.federation
+        self.identity_providers_mock = federation_lib.identity_providers
         self.identity_providers_mock.reset_mock()
 
 
@@ -56,7 +56,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         }
 
         self.identity_providers_mock.create.assert_called_with(
-            identity_fakes.idp_id,
+            id=identity_fakes.idp_id,
             **kwargs
         )
 
@@ -88,7 +88,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         }
 
         self.identity_providers_mock.create.assert_called_with(
-            identity_fakes.idp_id,
+            id=identity_fakes.idp_id,
             **kwargs
         )
 
@@ -128,7 +128,7 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         }
 
         self.identity_providers_mock.create.assert_called_with(
-            identity_fakes.idp_id,
+            id=identity_fakes.idp_id,
             **kwargs
         )
 
@@ -217,12 +217,12 @@ class TestIdentityProviderShow(TestIdentityProvider):
     def setUp(self):
         super(TestIdentityProviderShow, self).setUp()
 
-        self.identity_providers_mock.get.return_value = fakes.FakeResource(
+        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)