Don't crash if there's no 'fixed_ip' attribute (was returning None, which was unsubscriptable)

1 files changed, 16 insertions, 14 deletions

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 486eca508..b54e28c0c 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -63,20 +63,22 @@ def _translate_detail_keys(inst):
     inst_dict['status'] = power_mapping[inst_dict['status']]
     inst_dict['addresses'] = dict(public=[], private=[])
 
-    # grab single private fixed ip
-    try:
-        private_ip = inst['fixed_ip']['address']
-        if private_ip:
-            inst_dict['addresses']['private'].append(private_ip)
-    except KeyError:
-        LOG.debug(_("Failed to read private ip"))
-
-    # grab all public floating ips
-    try:
-        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)"))
+    fixed_ip = inst['fixed_ip']
+    if fixed_ip:
+        # grab single private fixed ip
+        try:
+            private_ip = fixed_ip['address']
+            if private_ip:
+                inst_dict['addresses']['private'].append(private_ip)
+        except KeyError:
+            LOG.debug(_("Failed to read private ip"))
+
+        # grab all public floating ips
+        try:
+            for floating in fixed_ip['floating_ips']:
+                inst_dict['addresses']['public'].append(floating['address'])
+        except KeyError:
+            LOG.debug(_("Failed to read public ip(s)"))
 
     inst_dict['metadata'] = {}
     inst_dict['hostId'] = ''