summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-07-07 10:48:17 -0400
committerMark Washenberger <mark.washenberger@rackspace.com>2011-07-07 10:48:17 -0400
commitb50e92d43f958bf966fce4f608daa467b40453c1 (patch)
tree57bf0bb354f7f789d06ae2b992def86ce7c0bdda /nova/api
parent8caf69dc93d9112e9be8989cd2136a407e09df44 (diff)
make server and image metadata optional
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/images.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index eaa7aef5a..8746db4e0 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -285,9 +285,10 @@ class ImageXMLSerializer(wsgi.DictSerializer):
server_node = self._create_server_node(xml_doc, image['server'])
image_node.appendChild(server_node)
- metadata = image.get('metadata', {})
- metadata_node = self._create_metadata_node(xml_doc, metadata.items())
- image_node.appendChild(metadata_node)
+ metadata = image.get('metadata', {}).items()
+ if len(metadata) > 0:
+ metadata_node = self._create_metadata_node(xml_doc, metadata)
+ image_node.appendChild(metadata_node)
self._add_atom_links(xml_doc, image_node, image['links'])