From 8230533824fd170498e51b43dd2f20e6af410c53 Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Mon, 28 Nov 2011 17:00:47 -0800 Subject: removed logic of throwing exception if no floating ip fixes 897089 Change-Id: Iaa03c7b75abf67c78b4605c29ef1770c96c6a199 --- nova/api/openstack/v2/contrib/floating_ips.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'nova/api') 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) -- cgit