x/cloudcafe
Code Issues Proposed changes

Modified server response model to allow for null images

Browse Source 
* Changed serialization to check if image field is null or empty before
  attempting serialization
* Added unit tests to verify serialization does not fail for the server
  response object if the image field is the empty string

Change-Id: Ifc9df4d5288e64a173ad2c5c882469ae75dcad5b
This commit is contained in:
Daryl Walleck
2014-01-28 10:51:13 -06:00
parent 2d1e44ebca
commit a9fe849b33
2 changed files with 135 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cloudcafe/compute/servers_api/models/servers.py
View File

@@ -122,7 +122,7 @@ class Server(AutoMarshallingModel):
addresses = Addresses._xml_ele_to_obj(element.find('addresses'))
if element.find('flavor') is not None:
flavor = Flavor._xml_ele_to_obj(element.find('flavor'))
if element.find('image') is not None:
if element.find('image'):
image = Image._xml_ele_to_obj(element.find('image'))
if element.find('metadata') is not None:
metadata = Metadata._xml_ele_to_obj(element.find('metadata'))
@@ -168,7 +168,7 @@ class Server(AutoMarshallingModel):
addresses = Addresses._dict_to_obj(server_dict['addresses'])
if 'flavor' in server_dict:
flavor = FlavorMin._dict_to_obj(server_dict['flavor'])
if 'image' in server_dict:
if 'image' in server_dict and server_dict.get('image'):
image = ImageMin._dict_to_obj(server_dict['image'])
if 'metadata' in server_dict:
metadata = Metadata._dict_to_obj(server_dict['metadata'])