summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-08-18 12:19:47 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-08-18 12:19:47 -0400
commit155d640d3d53bcf76daa0ff0ae67ac5dbbe3022a (patch)
tree0da2c10f738e849f95d49b536b252b8755d6a60f /nova/api
parent9b5416e8afc115fabb76664a65b6d33e9ba89b7f (diff)
downloadnova-155d640d3d53bcf76daa0ff0ae67ac5dbbe3022a.tar.gz
nova-155d640d3d53bcf76daa0ff0ae67ac5dbbe3022a.tar.xz
nova-155d640d3d53bcf76daa0ff0ae67ac5dbbe3022a.zip
Fixed issue where accessIP was added in none detail responses
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/servers.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 3b91c037a..8b3a1e221 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -143,6 +143,12 @@ class ViewBuilderV11(ViewBuilder):
response['server']['progress'] = 100
elif response['server']['status'] == "BUILD":
response['server']['progress'] = 0
+
+ if inst.get('access_ip_v4'):
+ response['server']['accessIPv4'] = inst['access_ip_v4']
+ if inst.get('access_ip_v6'):
+ response['server']['accessIPv6'] = inst['access_ip_v6']
+
return response
def _build_image(self, response, inst):
@@ -182,10 +188,6 @@ class ViewBuilderV11(ViewBuilder):
def _build_extra(self, response, inst):
self._build_links(response, inst)
response['uuid'] = inst['uuid']
- if inst.get('access_ip_v4'):
- response['accessIPv4'] = inst['access_ip_v4']
- if inst.get('access_ip_v6'):
- response['accessIPv6'] = inst['access_ip_v6']
def _build_links(self, response, inst):
href = self.generate_href(inst["id"])