diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-29 20:07:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-29 20:07:35 +0000 |
| commit | 8efd022956dfe1e925710d8ec7d011607257e116 (patch) | |
| tree | 193c4e2b4ff59fcddf01d37aaa7074a1eda77ab5 /nova/api | |
| parent | da003c175a8211d6070fa9b171e67c4cf012e9cc (diff) | |
| parent | 8230533824fd170498e51b43dd2f20e6af410c53 (diff) | |
Merge "removed logic of throwing exception if no floating ip"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/v2/contrib/floating_ips.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/api/openstack/v2/contrib/floating_ips.py b/nova/api/openstack/v2/contrib/floating_ips.py index 9689eac48..8bb575682 100644 --- a/nova/api/openstack/v2/contrib/floating_ips.py +++ b/nova/api/openstack/v2/contrib/floating_ips.py @@ -77,13 +77,10 @@ class FloatingIPController(object): return _translate_floating_ip_view(floating_ip) def index(self, req): + """Return a list of floating ips allocated to a project.""" context = req.environ['nova.context'] - try: - get_floating_ips = self.network_api.get_floating_ips_by_project - floating_ips = get_floating_ips(context) - except exception.FloatingIpNotFoundForProject: - floating_ips = [] + floating_ips = self.network_api.get_floating_ips_by_project(context) return _translate_floating_ips_view(floating_ips) |