summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-02-23 14:16:31 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2011-02-23 14:16:31 -0800
commit8c007b56b586257d048b6db4ecfbed8f502381fd (patch)
tree6d4c91e2f4c02258f860fac90e05d5117e067ebc /nova/api
parenta508e2dce781b98db5a719df75a451d9a2727fca (diff)
downloadnova-8c007b56b586257d048b6db4ecfbed8f502381fd.tar.gz
nova-8c007b56b586257d048b6db4ecfbed8f502381fd.tar.xz
nova-8c007b56b586257d048b6db4ecfbed8f502381fd.zip
Put back the comments I accidentally removed
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 6c227d71a..97323f66f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -63,9 +63,11 @@ def _translate_detail_keys(inst):
inst_dict['status'] = power_mapping[inst_dict['status']]
inst_dict['addresses'] = dict(public=[], private=[])
+ # grab single private fixed ip
private_ips = utils.get_from_path(inst, 'fixed_ip/address')
inst_dict['addresses']['private'] = private_ips
+ # grab all public floating ips
public_ips = utils.get_from_path(inst, 'fixed_ip/floating_ips/address')
inst_dict['addresses']['public'] = public_ips