Skip to content

Commit

Permalink
Implementing solution for 2002563 issue from story board
Browse files Browse the repository at this point in the history 
Includes:
patch in _get_grant_revoke_params to work with domain_id

Fixed UT to work with change

Change-Id: Ic892f028e1a3468abaafdcd079ae0142104b6f97
  • Loading branch information
@wacuuu
wacuuu committed Jul 2, 2018
1 parent fb31727 commit 3fce613
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 19 deletions.
7 changes: 6 additions & 1 deletion openstack/cloud/openstackcloud.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10888,7 +10888,12 @@ def _get_grant_revoke_params(self, role, user=None, group=None,
self.get_domain(domain)['id']

if user:
data['user'] = self.get_user(user, filters=filters)
if domain:
data['user'] = self.get_user(user,
domain_id=filters['domain_id'],
filters=filters)
else:
data['user'] = self.get_user(user, filters=filters)

if project:
# drop domain in favor of project
Expand Down
108 changes: 90 additions & 18 deletions openstack/tests/unit/cloud/test_role_assignment.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,11 @@ def test_grant_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -693,7 +697,11 @@ def test_grant_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -724,7 +732,11 @@ def test_grant_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -755,7 +767,11 @@ def test_grant_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -807,7 +823,11 @@ def test_grant_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -836,7 +856,11 @@ def test_grant_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -865,7 +889,11 @@ def test_grant_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -894,7 +922,11 @@ def test_grant_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -1768,7 +1800,11 @@ def test_revoke_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand All @@ -1791,7 +1827,11 @@ def test_revoke_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand All @@ -1814,7 +1854,11 @@ def test_revoke_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand All @@ -1837,7 +1881,11 @@ def test_revoke_role_user_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -1881,7 +1929,11 @@ def test_revoke_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -1917,7 +1969,11 @@ def test_revoke_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -1953,7 +2009,11 @@ def test_revoke_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -1989,7 +2049,11 @@ def test_revoke_role_user_domain_exists(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -2478,7 +2542,11 @@ def test_grant_both_project_and_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down Expand Up @@ -2527,7 +2595,11 @@ def test_revoke_both_project_and_domain(self):
status_code=200,
json=self.domain_data.json_response),
dict(method='GET',
uri=self.get_mock_url(resource='users'),
uri=self.get_mock_url(resource='users',
qs_elements=['domain_id=%s' %
self.domain_data.
domain_id]),
complete_qs=True,
status_code=200,
json={'users': [self.user_data.json_response['user']]}),
dict(method='GET',
Expand Down

0 comments on commit 3fce613

Please sign in to comment.