openstack
/
horizon
Code Issues Proposed changes

Fix E127 errors in other openstack_dashboard/dashboards/ 

E127 continuation line over-indented for visual indent

Partial-Bug: #1375931
Change-Id: Idad463a925d622908662942dc8a58ce888242f28
This commit is contained in:
Akihiro Motoki 2014-09-30 22:31:47 +09:00
parent f99981fc9c
commit 05068093a5
6 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openstack_dashboard/dashboards/identity/domains/tests.py
View File

@ -320,12 +320,12 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
# admin user - try to remove all roles on current domain, warning
api.keystone.roles_for_user(IsA(http.HttpRequest), '1',
domain=domain.id) \
.AndReturn(roles)
.AndReturn(roles)
# member user 1 - has role 1, will remove it
api.keystone.roles_for_user(IsA(http.HttpRequest), '2',
domain=domain.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# remove role 1
api.keystone.remove_domain_user_role(IsA(http.HttpRequest),
domain=domain.id,
@ -340,7 +340,7 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
# member user 3 - has role 2
api.keystone.roles_for_user(IsA(http.HttpRequest), '3',
domain=domain.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# remove role 2
api.keystone.remove_domain_user_role(IsA(http.HttpRequest),
domain=domain.id,
@ -355,7 +355,7 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
# member user 5 - do nothing
api.keystone.roles_for_user(IsA(http.HttpRequest), '5',
domain=domain.id) \
.AndReturn([])
.AndReturn([])
# Group assignments
api.keystone.group_list(IsA(http.HttpRequest),
@ -365,7 +365,7 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='1',
domain=domain.id) \
.AndReturn(roles)
.AndReturn(roles)
for role in roles:
api.keystone.remove_group_role(IsA(http.HttpRequest),
role=role.id,
@ -376,7 +376,7 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='2',
domain=domain.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# remove role 1
api.keystone.remove_group_role(IsA(http.HttpRequest),
role='1',
@ -392,7 +392,7 @@ class UpdateDomainWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='3',
domain=domain.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# remove role 2
api.keystone.remove_group_role(IsA(http.HttpRequest),
role='2',

17
openstack_dashboard/dashboards/identity/domains/workflows.py
View File

@ -69,8 +69,8 @@ class UpdateDomainUsersAction(workflows.MembershipAction):
if default_role is None:
default = getattr(settings,
"OPENSTACK_KEYSTONE_DEFAULT_ROLE", None)
msg = _('Could not find default role "%s" in Keystone') % \
default
msg = (_('Could not find default role "%s" in Keystone') %
default)
raise exceptions.NotFound(msg)
except Exception:
exceptions.handle(self.request,
@ -168,8 +168,8 @@ class UpdateDomainGroupsAction(workflows.MembershipAction):
if default_role is None:
default = getattr(settings,
"OPENSTACK_KEYSTONE_DEFAULT_ROLE", None)
msg = _('Could not find default role "%s" in Keystone') % \
default
msg = (_('Could not find default role "%s" in Keystone') %
default)
raise exceptions.NotFound(msg)
except Exception:
exceptions.handle(self.request,
@ -319,7 +319,7 @@ class UpdateDomain(workflows.Workflow):
# Get the users currently associated with this project so we
# can diff against it.
domain_members = api.keystone.user_list(request,
domain=domain_id)
domain=domain_id)
users_to_modify = len(domain_members)
for user in domain_members:
@ -399,9 +399,10 @@ class UpdateDomain(workflows.Workflow):
users_to_modify -= users_added
return True
except Exception:
exceptions.handle(request, _('Failed to modify %s project '
'members and update domain groups.')
% users_to_modify)
exceptions.handle(request,
_('Failed to modify %s project '
'members and update domain groups.')
% users_to_modify)
return False
def _update_domain_groups(self, request, domain_id, data):

48
openstack_dashboard/dashboards/identity/projects/tests.py
View File

@ -325,12 +325,12 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
project_details = self._get_project_info(project)
quota_data = self._get_quota_info(quota)
api.keystone.tenant_create(IsA(http.HttpRequest), **project_details) \
.AndReturn(project)
.AndReturn(project)
workflow_data = {}
for role in roles:
@ -478,7 +478,7 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
project_details = self._get_project_info(project)
api.keystone.tenant_create(IsA(http.HttpRequest), **project_details) \
@ -538,7 +538,7 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
api.keystone.group_list(IsA(http.HttpRequest), domain=domain_id) \
.AndReturn(groups)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
self.mox.ReplayAll()
@ -591,7 +591,7 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
project_details = self._get_project_info(project)
quota_data = self._get_quota_info(quota)
@ -680,7 +680,7 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
project_details = self._get_project_info(project)
quota_data = self._get_quota_info(quota)
@ -764,7 +764,7 @@ class CreateProjectWorkflowTests(test.BaseAdminViewTests):
.AndReturn(groups)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
self.mox.ReplayAll()
@ -1023,12 +1023,12 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# admin user - try to remove all roles on current project, warning
api.keystone.roles_for_user(IsA(http.HttpRequest), '1',
self.tenant.id) \
.AndReturn(roles)
.AndReturn(roles)
# member user 1 - has role 1, will remove it
api.keystone.roles_for_user(IsA(http.HttpRequest), '2',
self.tenant.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# remove role 1
api.keystone.remove_tenant_user_role(IsA(http.HttpRequest),
project=self.tenant.id,
@ -1043,7 +1043,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# member user 3 - has role 2
api.keystone.roles_for_user(IsA(http.HttpRequest), '3',
self.tenant.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# remove role 2
api.keystone.remove_tenant_user_role(IsA(http.HttpRequest),
project=self.tenant.id,
@ -1064,7 +1064,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='1',
project=self.tenant.id) \
.AndReturn(roles)
.AndReturn(roles)
for role in roles:
api.keystone.remove_group_role(IsA(http.HttpRequest),
role=role.id,
@ -1075,7 +1075,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='2',
project=self.tenant.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# remove role 1
api.keystone.remove_group_role(IsA(http.HttpRequest),
role='1',
@ -1091,7 +1091,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='3',
project=self.tenant.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# remove role 2
api.keystone.remove_group_role(IsA(http.HttpRequest),
role='2',
@ -1104,7 +1104,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
project=self.tenant.id)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
nova_updated_quota = dict([(key, updated_quota[key]) for key in
quotas.NOVA_QUOTA_FIELDS])
@ -1267,7 +1267,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
api.keystone.tenant_update(IsA(http.HttpRequest),
project.id,
**updated_project) \
@ -1396,17 +1396,17 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# admin user - try to remove all roles on current project, warning
api.keystone.roles_for_user(IsA(http.HttpRequest), '1',
self.tenant.id) \
.AndReturn(roles)
.AndReturn(roles)
# member user 1 - has role 1, will remove it
api.keystone.roles_for_user(IsA(http.HttpRequest), '2',
self.tenant.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# member user 3 - has role 2
api.keystone.roles_for_user(IsA(http.HttpRequest), '3',
self.tenant.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# add role 2
api.keystone.add_tenant_user_role(IsA(http.HttpRequest),
project=self.tenant.id,
@ -1422,19 +1422,19 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='1',
project=self.tenant.id) \
.AndReturn(roles)
.AndReturn(roles)
# member group 1 - has no change
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='2',
project=self.tenant.id) \
.AndReturn((roles[1],))
.AndReturn((roles[1],))
# member group 3 - has role 1
api.keystone.roles_for_group(IsA(http.HttpRequest),
group='3',
project=self.tenant.id) \
.AndReturn((roles[0],))
.AndReturn((roles[0],))
# add role 2
api.keystone.add_group_role(IsA(http.HttpRequest),
@ -1443,14 +1443,14 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
project=self.tenant.id)
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
nova_updated_quota = dict([(key, updated_quota[key]) for key in
quotas.NOVA_QUOTA_FIELDS])
api.nova.tenant_quota_update(IsA(http.HttpRequest),
project.id,
**nova_updated_quota) \
.AndRaise(self.exceptions.nova)
.AndRaise(self.exceptions.nova)
self.mox.ReplayAll()
@ -1563,7 +1563,7 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest)) \
.AndReturn(quota_usages)
.AndReturn(quota_usages)
api.keystone.tenant_update(IsA(http.HttpRequest),
project.id,
**updated_project) \

33
openstack_dashboard/dashboards/identity/projects/workflows.py
View File

@ -97,8 +97,8 @@ class UpdateProjectQuotaAction(workflows.Action):
used = usages[key].get('used', 0)
if value is not None and value >= 0 and used > value:
bad_values.append(_('%(used)s %(key)s used') %
{'used': used,
'key': quotas.QUOTA_NAMES.get(key, key)})
{'used': used,
'key': quotas.QUOTA_NAMES.get(key, key)})
if bad_values:
value_str = ", ".join(bad_values)
msg = (_('Quota value(s) cannot be less than the current usage '
@ -176,8 +176,8 @@ class UpdateProjectMembersAction(workflows.MembershipAction):
if default_role is None:
default = getattr(settings,
"OPENSTACK_KEYSTONE_DEFAULT_ROLE", None)
msg = _('Could not find default role "%s" in Keystone') % \
default
msg = (_('Could not find default role "%s" in Keystone') %
default)
raise exceptions.NotFound(msg)
except Exception:
exceptions.handle(self.request,
@ -274,8 +274,8 @@ class UpdateProjectGroupsAction(workflows.MembershipAction):
if default_role is None:
default = getattr(settings,
"OPENSTACK_KEYSTONE_DEFAULT_ROLE", None)
msg = _('Could not find default role "%s" in Keystone') % \
default
msg = (_('Could not find default role "%s" in Keystone') %
default)
raise exceptions.NotFound(msg)
except Exception:
exceptions.handle(self.request,
@ -422,11 +422,11 @@ class CreateProject(workflows.Workflow):
group_msg = _(", add project groups")
else:
group_msg = ""
exceptions.handle(request, _('Failed to add %(users_to_add)s '
'project members%(group_msg)s and '
'set project quotas.')
% {'users_to_add': users_to_add,
'group_msg': group_msg})
exceptions.handle(request,
_('Failed to add %(users_to_add)s project '
'members%(group_msg)s and set project quotas.')
% {'users_to_add': users_to_add,
'group_msg': group_msg})
if PROJECT_GROUP_ENABLED:
# update project groups
@ -643,11 +643,12 @@ class UpdateProject(workflows.Workflow):
group_msg = _(", update project groups")
else:
group_msg = ""
exceptions.handle(request, _('Failed to modify %(users_to_modify)s'
' project members%(group_msg)s and '
'update project quotas.')
% {'users_to_modify': users_to_modify,
'group_msg': group_msg})
exceptions.handle(request,
_('Failed to modify %(users_to_modify)s'
' project members%(group_msg)s and '
'update project quotas.')
% {'users_to_modify': users_to_modify,
'group_msg': group_msg})
return False
if PROJECT_GROUP_ENABLED:

2
openstack_dashboard/dashboards/identity/roles/tests.py
View File

@ -99,7 +99,7 @@ class RolesViewTests(test.BaseAdminViewTests):
role = self.roles.first()
api.keystone.role_list(IsA(http.HttpRequest)) \
.AndReturn(self.roles.list())
.AndReturn(self.roles.list())
api.keystone.role_delete(IsA(http.HttpRequest),
role.id).AndReturn(None)

2
openstack_dashboard/dashboards/identity/users/views.py
View File

@ -103,7 +103,7 @@ class UpdateView(forms.ModalFormView):
if api.keystone.VERSIONS.active >= 3:
try:
domain = api.keystone.domain_get(self.request,
domain_id)
domain_id)
domain_name = domain.name
except Exception:
exceptions.handle(self.request,