openstack/trove
Code Issues Proposed changes

Merge "correct api schema for instance patch"

Browse Source
This commit is contained in:
Jenkins 2015-06-09 20:43:24 +00:00 committed by Gerrit Code Review
commit 3c8112735d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trove/common/apischema.py
View File

@ -197,9 +197,14 @@ users_list = {
}
}
null_configuration_id = {
"type": "null"
}
configuration_id = {
'oneOf': [
uuid
uuid,
null_configuration_id
]
}
@ -301,10 +306,12 @@ instance = {
"instance": {
"type": "object",
"required": [],
"additionalProperties": False,
"properties": {
"slave_of": {},
"replica_of": {},
"name": non_empty_string,
"configuration_id": configuration_id,
"configuration": configuration_id,
}
}
}

4
trove/instance/service.py
View File

@ -304,7 +304,9 @@ class InstanceController(wsgi.Controller):
instance = models.Instance.load(context, id)
args = {}
args['detach_replica'] = 'slave_of' in body['instance']
args['detach_replica'] = ('replica_of' in body['instance'] or
'slave_of' in body['instance'])
if 'name' in body['instance']:
args['name'] = body['instance']['name']
if 'configuration' in body['instance']: