summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-02-17 09:48:16 -0500
committerBrian Waldon <brian.waldon@rackspace.com>2011-02-17 09:48:16 -0500
commite28ce7f82d1c89ab0c4e5ebfa98c12f502a33138 (patch)
treefea2fe8d9bf4b5165498dbb288056f8ba023204b /nova/api
parent8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (diff)
downloadnova-e28ce7f82d1c89ab0c4e5ebfa98c12f502a33138.tar.gz
nova-e28ce7f82d1c89ab0c4e5ebfa98c12f502a33138.tar.xz
nova-e28ce7f82d1c89ab0c4e5ebfa98c12f502a33138.zip
removing superfluous pass statements; replacing list comprehension with for loop; alphabetizing imports
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 60f3d96e3..312d83ba5 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -72,15 +72,13 @@ def _translate_detail_keys(inst):
inst_dict['addresses']['private'].append(private_ip)
except KeyError:
LOG.debug(_("Failed to read private ip"))
- pass
# grab all public floating ips
try:
- [inst_dict['addresses']['public'].append(floating['address']) \
- for floating in inst['fixed_ip']['floating_ips']]
+ for floating in inst['fixed_ip']['floating_ips']:
+ inst_dict['addresses']['public'].append(floating['address'])
except KeyError:
LOG.debug(_("Failed to read public ip(s)"))
- pass
inst_dict['metadata'] = {}
inst_dict['hostId'] = ''