From 797859beb7848a6661940aa9028dbfcd2fcb28dd Mon Sep 17 00:00:00 2001 From: pengyuesheng Date: Thu, 12 Apr 2018 16:02:01 +0800 Subject: [PATCH] Floating ip filter has no effect the API of tenant_floating_ip_list add '**search_opts', Change-Id: Ie4f47f768909a2af7a916d2ad6ce43b3e157b432 Closes-Bug: #1763280 --- openstack_dashboard/api/neutron.py | 5 +++-- openstack_dashboard/dashboards/admin/floating_ips/views.py | 4 +++- openstack_dashboard/dashboards/project/floating_ips/views.py | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py index 438667eceb..921b3b83e4 100644 --- a/openstack_dashboard/api/neutron.py +++ b/openstack_dashboard/api/neutron.py @@ -1595,8 +1595,9 @@ def floating_ip_pools_list(request): @memoized -def tenant_floating_ip_list(request, all_tenants=False): - return FloatingIpManager(request).list(all_tenants=all_tenants) +def tenant_floating_ip_list(request, all_tenants=False, **search_opts): + return FloatingIpManager(request).list(all_tenants=all_tenants, + **search_opts) def tenant_floating_ip_get(request, floating_ip_id): diff --git a/openstack_dashboard/dashboards/admin/floating_ips/views.py b/openstack_dashboard/dashboards/admin/floating_ips/views.py index 02d4f14c30..39d5c53b3f 100644 --- a/openstack_dashboard/dashboards/admin/floating_ips/views.py +++ b/openstack_dashboard/dashboards/admin/floating_ips/views.py @@ -64,10 +64,12 @@ class IndexView(tables.DataTableView): @memoized.memoized_method def get_data(self): floating_ips = [] + search_opts = self.get_filters() try: floating_ips = api.neutron.tenant_floating_ip_list( self.request, - all_tenants=True) + all_tenants=True, + **search_opts) except Exception: exceptions.handle(self.request, _('Unable to retrieve floating IP list.')) diff --git a/openstack_dashboard/dashboards/project/floating_ips/views.py b/openstack_dashboard/dashboards/project/floating_ips/views.py index 9e948d475d..d9bfead9e8 100644 --- a/openstack_dashboard/dashboards/project/floating_ips/views.py +++ b/openstack_dashboard/dashboards/project/floating_ips/views.py @@ -89,7 +89,9 @@ class IndexView(tables.DataTableView): def get_data(self): try: - floating_ips = api.neutron.tenant_floating_ip_list(self.request) + search_opts = self.get_filters() + floating_ips = api.neutron.tenant_floating_ip_list(self.request, + **search_opts) except neutron_exc.ConnectionFailed: floating_ips = [] exceptions.handle(self.request)