summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-08-19 16:36:20 -0400
committerAlex Meade <alex.meade@rackspace.com>2011-08-19 16:36:20 -0400
commit5f6cd490425d8d91870de1b4a492a6cb34502bcb (patch)
tree90ec5e0223d60b8799504b00090084c90888342c /nova/api
parent9827c92838d144f7c129e9e5545126f100926dba (diff)
Updated accessIPv4 and accessIPv6 to always be in a servers response
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/servers.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 8b3a1e221..d2c1b0ba1 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -144,10 +144,8 @@ class ViewBuilderV11(ViewBuilder):
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']
+ response['server']['accessIPv4'] = inst.get('access_ip_v4') or ""
+ response['server']['accessIPv6'] = inst.get('access_ip_v6') or ""
return response