openstack
/
magnum
Code Issues Proposed changes

Merge "Removed container_id from container api."

This commit is contained in:
Jenkins 2015-02-04 19:47:56 +00:00 committed by Gerrit Code Review
parent 2720b8fe0f 5163e1214f
commit ad1471f0dd
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/api/controllers/v1/container.py
View File

@ -36,10 +36,7 @@ LOG = logging.getLogger(__name__)
class ContainerPatchType(types.JsonPatchType):
@staticmethod
def mandatory_attrs():
return ['/container_uuid']
pass
class Container(base.APIBase):
@ -317,8 +314,6 @@ class ContainersController(rest.RestController):
container_uuid)
try:
container_dict = rpc_container.as_dict()
container_dict['container_uuid'] = container_dict.pop(
'container_id', None)
container = Container(**api_utils.apply_jsonpatch(
container_dict, patch))
except api_utils.JSONPATCH_EXCEPTIONS as e: