Initialize BadRequest exception with correct message.
Currently some BadRequest exceptions are raised with a wrong argument 'msg', this leads to totally helpless informations returned by the API when errors occurr. This patch fixes the problem. Change-Id: Ifd821e8297a44fd0b25f879f79fe6a2456c1d8a5 Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
This commit is contained in:
parent
7061c37854
commit
5abbdc9b59
@ -216,7 +216,7 @@ class ClusterController(wsgi.Controller):
|
||||
(locality,
|
||||
"', '".join(locality_domain)))
|
||||
if locality not in locality_domain:
|
||||
raise exception.BadRequest(msg=locality_domain_msg)
|
||||
raise exception.BadRequest(message=locality_domain_msg)
|
||||
|
||||
configuration = body['cluster'].get('configuration')
|
||||
|
||||
|
@ -122,7 +122,7 @@ class DefaultRootController(BaseDatastoreRootController):
|
||||
try:
|
||||
found_user = self._find_root_user(context, instance_id)
|
||||
except (ValueError, AttributeError) as e:
|
||||
raise exception.BadRequest(msg=str(e))
|
||||
raise exception.BadRequest(message=str(e))
|
||||
if not found_user:
|
||||
raise exception.UserNotFound(uuid="root")
|
||||
models.Root.delete(context, instance_id)
|
||||
|
@ -111,7 +111,7 @@ class SecurityGroupRuleController(wsgi.Controller):
|
||||
CONF.os_region_name)
|
||||
rules.append(rule)
|
||||
except (ValueError, AttributeError) as e:
|
||||
raise exception.BadRequest(msg=str(e))
|
||||
raise exception.BadRequest(message=str(e))
|
||||
return rules
|
||||
|
||||
tcp_rules = _create_rules(sec_group, tcp_ports, 'tcp')
|
||||
|
@ -289,7 +289,7 @@ class InstanceController(wsgi.Controller):
|
||||
users = populate_users(body['instance'].get('users', []),
|
||||
database_names)
|
||||
except ValueError as ve:
|
||||
raise exception.BadRequest(msg=ve)
|
||||
raise exception.BadRequest(message=ve)
|
||||
|
||||
modules = body['instance'].get('modules')
|
||||
|
||||
@ -339,12 +339,12 @@ class InstanceController(wsgi.Controller):
|
||||
(locality,
|
||||
"', '".join(locality_domain)))
|
||||
if locality not in locality_domain:
|
||||
raise exception.BadRequest(msg=locality_domain_msg)
|
||||
raise exception.BadRequest(message=locality_domain_msg)
|
||||
if slave_of_id:
|
||||
dupe_locality_msg = (
|
||||
'Cannot specify locality when adding replicas to existing '
|
||||
'master.')
|
||||
raise exception.BadRequest(msg=dupe_locality_msg)
|
||||
raise exception.BadRequest(message=dupe_locality_msg)
|
||||
region_name = body['instance'].get('region_name', CONF.os_region_name)
|
||||
|
||||
instance = models.Instance.create(context, name, flavor_id,
|
||||
|
Loading…
Reference in New Issue
Block a user