openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Clarify roles validation error messages"

Browse Source
This commit is contained in:
Jenkins
2014-01-17 15:33:25 +00:00
committed by Gerrit Code Review
parent 8a118718c7 29d9873947
commit 0c595f96f3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystoneclient/v3/roles.py
View File

@@ -57,14 +57,20 @@ class RoleManager(base.CrudManager):
return base_url % params return base_url % params
def _require_domain_xor_project(self, domain, project): def _require_domain_xor_project(self, domain, project):
if (domain and project) or (not domain and not project): if domain and project:
msg = 'Specify either a domain or project, not both' msg = 'Specify either a domain or project, not both'
raise exceptions.ValidationError(msg) raise exceptions.ValidationError(msg)
elif not (domain or project):
msg = 'Must specify either a domain or project'
raise exceptions.ValidationError(msg)
def _require_user_xor_group(self, user, group): def _require_user_xor_group(self, user, group):
if (user and group) or (not user and not group): if user and group:
msg = 'Specify either a user or group, not both' msg = 'Specify either a user or group, not both'
raise exceptions.ValidationError(msg) raise exceptions.ValidationError(msg)
elif not (user or group):
msg = 'Must specify either a user or group'
raise exceptions.ValidationError(msg)
def create(self, name): def create(self, name):
return super(RoleManager, self).create( return super(RoleManager, self).create(