diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-26 13:49:04 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-07-26 13:49:04 -0400 |
| commit | 7cd146e7e658c51cc94664d8da8d2bc15b0141fc (patch) | |
| tree | d39b0bdcc17ddc4ea702b4489b34b3d68677b2e8 | |
| parent | 5ccd5afe1a854c82927b0dd1b2bf6cd795a23576 (diff) | |
| download | nova-7cd146e7e658c51cc94664d8da8d2bc15b0141fc.tar.gz nova-7cd146e7e658c51cc94664d8da8d2bc15b0141fc.tar.xz nova-7cd146e7e658c51cc94664d8da8d2bc15b0141fc.zip | |
fixed minor issues
| -rw-r--r-- | nova/api/openstack/servers.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 11dafc272..194ec82d5 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -630,8 +630,8 @@ class ServerXMLSerializer(wsgi.XMLDictSerializer): node.setAttribute('uuid', str(server['uuid'])) node.setAttribute('hostId', str(server['hostId'])) node.setAttribute('name', server['name']) - node.setAttribute('created', server['created']) - node.setAttribute('updated', server['updated']) + node.setAttribute('created', str(server['created'])) + node.setAttribute('updated', str(server['updated'])) node.setAttribute('status', server['status']) if 'progress' in server: node.setAttribute('progress', str(server['progress'])) @@ -655,17 +655,19 @@ class ServerXMLSerializer(wsgi.XMLDictSerializer): for link_node in link_nodes: server_node.appendChild(link_node) - image_node = self._create_basic_entity_node(xml_doc, + if 'image' in server: + image_node = self._create_basic_entity_node(xml_doc, server['image']['id'], server['image']['links'], 'image') - server_node.appendChild(image_node) + server_node.appendChild(image_node) - flavor_node = self._create_basic_entity_node(xml_doc, + if 'flavor' in server: + flavor_node = self._create_basic_entity_node(xml_doc, server['flavor']['id'], server['flavor']['links'], 'flavor') - server_node.appendChild(flavor_node) + server_node.appendChild(flavor_node) metadata = server.get('metadata', {}).items() if len(metadata) > 0: |