Change 'Member' role reference to 'member'
'Member' role has been deprecated and replaced by 'member'. The patch replaces the leftover occurrences of 'Member' by 'member'. Change-Id: I857655b8568eb2df1bb9bc263117119388d42f01 Closes-Bug: #1330132
This commit is contained in:
parent
3c272360d4
commit
99d4dae684
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
``Member`` role has been deprecated and replaced by ``member``. Therefore
|
||||||
|
the default value of config option ``[object-storage].operator_role`` is
|
||||||
|
changed to ``member``. (Fixes bug #1330132)
|
|
@ -1021,7 +1021,7 @@ ObjectStoreGroup = [
|
||||||
help="Number of seconds to wait while looping to check the "
|
help="Number of seconds to wait while looping to check the "
|
||||||
"status of a container to container synchronization"),
|
"status of a container to container synchronization"),
|
||||||
cfg.StrOpt('operator_role',
|
cfg.StrOpt('operator_role',
|
||||||
default='Member',
|
default='member',
|
||||||
help="Role to add to users created for swift tests to "
|
help="Role to add to users created for swift tests to "
|
||||||
"enable creating containers"),
|
"enable creating containers"),
|
||||||
cfg.StrOpt('reseller_admin_role',
|
cfg.StrOpt('reseller_admin_role',
|
||||||
|
|
|
@ -207,10 +207,10 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
|
||||||
# our newly created user has a role on the newly created project.
|
# our newly created user has a role on the newly created project.
|
||||||
if self.identity_version == 'v3' and not role_assigned:
|
if self.identity_version == 'v3' and not role_assigned:
|
||||||
try:
|
try:
|
||||||
self.creds_client.create_user_role('Member')
|
self.creds_client.create_user_role('member')
|
||||||
except lib_exc.Conflict:
|
except lib_exc.Conflict:
|
||||||
LOG.warning('Member role already exists, ignoring conflict.')
|
LOG.warning('member role already exists, ignoring conflict.')
|
||||||
self.creds_client.assign_user_role(user, project, 'Member')
|
self.creds_client.assign_user_role(user, project, 'member')
|
||||||
|
|
||||||
creds = self.creds_client.get_credentials(user, project, user_password)
|
creds = self.creds_client.get_credentials(user, project, user_password)
|
||||||
return cred_provider.TestResources(creds)
|
return cred_provider.TestResources(creds)
|
||||||
|
|
|
@ -110,7 +110,7 @@ class TestDynamicCredentialProvider(base.TestCase):
|
||||||
(200,
|
(200,
|
||||||
{'roles': [{'id': id, 'name': name},
|
{'roles': [{'id': id, 'name': name},
|
||||||
{'id': '1', 'name': 'FakeRole'},
|
{'id': '1', 'name': 'FakeRole'},
|
||||||
{'id': '2', 'name': 'Member'}]}))))
|
{'id': '2', 'name': 'member'}]}))))
|
||||||
return roles_fix
|
return roles_fix
|
||||||
|
|
||||||
def _mock_list_2_roles(self):
|
def _mock_list_2_roles(self):
|
||||||
|
@ -139,7 +139,7 @@ class TestDynamicCredentialProvider(base.TestCase):
|
||||||
return_value=(rest_client.ResponseBody
|
return_value=(rest_client.ResponseBody
|
||||||
(200, {'roles': [
|
(200, {'roles': [
|
||||||
{'id': '1', 'name': 'FakeRole'},
|
{'id': '1', 'name': 'FakeRole'},
|
||||||
{'id': '2', 'name': 'Member'}]}))))
|
{'id': '2', 'name': 'member'}]}))))
|
||||||
return roles_fix
|
return roles_fix
|
||||||
|
|
||||||
def _mock_list_ec2_credentials(self, user_id, tenant_id):
|
def _mock_list_ec2_credentials(self, user_id, tenant_id):
|
||||||
|
@ -664,6 +664,6 @@ class TestDynamicCredentialProviderV3(TestDynamicCredentialProvider):
|
||||||
with mock.patch('tempest.lib.common.dynamic_creds.LOG') as log_mock:
|
with mock.patch('tempest.lib.common.dynamic_creds.LOG') as log_mock:
|
||||||
creds._create_creds()
|
creds._create_creds()
|
||||||
log_mock.warning.assert_called_once_with(
|
log_mock.warning.assert_called_once_with(
|
||||||
"Member role already exists, ignoring conflict.")
|
"member role already exists, ignoring conflict.")
|
||||||
creds.creds_client.assign_user_role.assert_called_once_with(
|
creds.creds_client.assign_user_role.assert_called_once_with(
|
||||||
mock.ANY, mock.ANY, 'Member')
|
mock.ANY, mock.ANY, 'member')
|
||||||
|
|
Loading…
Reference in New Issue