openstack
/
magnum
Code Issues Proposed changes

Fix and clean up Container api 

Change-Id: I2da4a58309f76224dd2097def121b4106d239fa5
This commit is contained in:
digambar 2015-02-04 00:08:51 +05:30
parent 41f15002e3
commit df3960eb38
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,25 +50,6 @@ class Container(base.APIBase):
container.
"""
_container_uuid = None
def _get_container_uuid(self):
return self._container_uuid
def _set_container_uuid(self, value):
if value and self._container_uuid != value:
try:
container = objects.Container.get(pecan.request.context, value)
self._container_uuid = container.uuid
self.container_id = container.id
except exception.ContainerNotFound as e:
# Change error code because 404 (NotFound) is inappropriate
# response for a POST request to create a Container
e.code = 400 # BadRequest
raise e
elif value == wtypes.Unset:
self._container_uuid = wtypes.Unset
uuid = types.uuid
"""Unique UUID for this container"""
@ -83,19 +64,13 @@ class Container(base.APIBase):
def __init__(self, **kwargs):
self.fields = []
fields = list(objects.Container.fields)
fields.append('container_uuid')
for field in fields:
for field in objects.Container.fields:
# Skip fields we do not expose.
if not hasattr(self, field):
continue
self.fields.append(field)
setattr(self, field, kwargs.get(field, wtypes.Unset))
self.fields.append('container_id')
setattr(self, 'container_uuid',
kwargs.get('container_id', wtypes.Unset))
@staticmethod
def _convert_with_links(container, url, expand=True):
if not expand: