Fixed function grant_user_domain_role
- method is from top level class (not domain itself) - fixed specs
This commit is contained in:
parent
a65b0a3951
commit
d2b5bf7c37
@ -69,14 +69,16 @@ module OpenstackclientCookbook
|
|||||||
user = connection.users.find { |u| u.name == user_name }
|
user = connection.users.find { |u| u.name == user_name }
|
||||||
domain = connection.domains.find { |p| p.name == domain_name }
|
domain = connection.domains.find { |p| p.name == domain_name }
|
||||||
role = connection.roles.find { |r| r.name == role_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
|
end
|
||||||
|
|
||||||
action :revoke_domain do
|
action :revoke_domain do
|
||||||
user = connection.users.find { |u| u.name == user_name }
|
user = connection.users.find { |u| u.name == user_name }
|
||||||
domain = connection.domains.find { |p| p.name == domain_name }
|
domain = connection.domains.find { |p| p.name == domain_name }
|
||||||
role = connection.roles.find { |r| r.name == role_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
|
end
|
||||||
end
|
end
|
||||||
|
@ -55,8 +55,7 @@ describe 'openstackclient_test::user' do
|
|||||||
|
|
||||||
let(:found_domain) do
|
let(:found_domain) do
|
||||||
double :find,
|
double :find,
|
||||||
grant_domain_user_role: true,
|
id: 5
|
||||||
revoke_domain_user_role: true
|
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:domains_populated) do
|
let(:domains_populated) do
|
||||||
@ -151,7 +150,9 @@ describe 'openstackclient_test::user' do
|
|||||||
users: users_populated,
|
users: users_populated,
|
||||||
domains: domains_populated,
|
domains: domains_populated,
|
||||||
roles: roles_populated,
|
roles: roles_populated,
|
||||||
projects: projects_populated
|
projects: projects_populated,
|
||||||
|
grant_domain_user_role: true,
|
||||||
|
revoke_domain_user_role: true
|
||||||
end
|
end
|
||||||
|
|
||||||
before do
|
before do
|
||||||
@ -238,14 +239,14 @@ describe 'openstackclient_test::user' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it do
|
it do
|
||||||
expect(found_domain).to receive(:grant_domain_user_role)
|
expect(connection_dub).to receive(:grant_domain_user_role)
|
||||||
.with(4, 3)
|
.with(5, 4, 3)
|
||||||
chef_run
|
chef_run
|
||||||
end
|
end
|
||||||
|
|
||||||
it do
|
it do
|
||||||
expect(found_domain).to receive(:revoke_domain_user_role)
|
expect(connection_dub).to receive(:revoke_domain_user_role)
|
||||||
.with(4, 3)
|
.with(5, 4, 3)
|
||||||
chef_run
|
chef_run
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user