From d2b5bf7c37900ad59ed2a2baf523711f978107c6 Mon Sep 17 00:00:00 2001
From: Christoph Albers <c.albers@x-ion.de>
Date: Fri, 30 Sep 2016 10:24:14 +0200
Subject: [PATCH] Fixed function grant_user_domain_role

- method is from top level class (not domain itself)
- fixed specs
---
 libraries/openstack_user.rb |  6 ++++--
 spec/user_spec.rb           | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/libraries/openstack_user.rb b/libraries/openstack_user.rb
index 524d01f..f3e9b33 100644
--- a/libraries/openstack_user.rb
+++ b/libraries/openstack_user.rb
@@ -69,14 +69,16 @@ module OpenstackclientCookbook
       user = connection.users.find { |u| u.name == user_name }
       domain = connection.domains.find { |p| p.name == domain_name }
       role = connection.roles.find { |r| r.name == role_name }
-      domain.grant_domain_user_role user.id, role.id if role && domain && user
+      connection.grant_domain_user_role(
+        domain.id, user.id, role.id) if role && domain && user
     end
 
     action :revoke_domain do
       user = connection.users.find { |u| u.name == user_name }
       domain = connection.domains.find { |p| p.name == domain_name }
       role = connection.roles.find { |r| r.name == role_name }
-      domain.revoke_domain_user_role user.id, role.id if role && domain && user
+      connection.revoke_domain_user_role(
+        domain.id, user.id, role.id) if role && domain && user
     end
   end
 end
diff --git a/spec/user_spec.rb b/spec/user_spec.rb
index bdecc54..bc10d44 100644
--- a/spec/user_spec.rb
+++ b/spec/user_spec.rb
@@ -55,8 +55,7 @@ describe 'openstackclient_test::user' do
 
   let(:found_domain) do
     double :find,
-           grant_domain_user_role: true,
-           revoke_domain_user_role: true
+           id: 5
   end
 
   let(:domains_populated) do
@@ -151,7 +150,9 @@ describe 'openstackclient_test::user' do
              users: users_populated,
              domains: domains_populated,
              roles: roles_populated,
-             projects: projects_populated
+             projects: projects_populated,
+             grant_domain_user_role: true,
+             revoke_domain_user_role: true
     end
 
     before do
@@ -238,14 +239,14 @@ describe 'openstackclient_test::user' do
     end
 
     it do
-      expect(found_domain).to receive(:grant_domain_user_role)
-        .with(4, 3)
+      expect(connection_dub).to receive(:grant_domain_user_role)
+        .with(5, 4, 3)
       chef_run
     end
 
     it do
-      expect(found_domain).to receive(:revoke_domain_user_role)
-        .with(4, 3)
+      expect(connection_dub).to receive(:revoke_domain_user_role)
+        .with(5, 4, 3)
       chef_run
     end
   end