diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-01 06:36:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-01 06:36:25 +0000 |
| commit | 967807f898ec0f6b467045ca3f80feb6967d4177 (patch) | |
| tree | 09c1b8a4a967289b2fd4df965022db403f6d1a13 /nova/api | |
| parent | 7b95988c8bf87e8674fccab14d0e2a239e2384a6 (diff) | |
| parent | 45e92d47038514fc05ae17a8a38dae1b337c15fe (diff) | |
Merge "Optimize network calls by moving them to api"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 3f00136f5..81b8c3dc0 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -67,11 +67,11 @@ def _translate_floating_ip_view(floating_ip): } try: result['fixed_ip'] = floating_ip['fixed_ip']['address'] - except (TypeError, KeyError): + except (TypeError, KeyError, AttributeError): result['fixed_ip'] = None try: result['instance_id'] = floating_ip['instance']['uuid'] - except (TypeError, KeyError): + except (TypeError, KeyError, AttributeError): result['instance_id'] = None return {'floating_ip': result} |