Refactor swap_filter in instance views

Previously we check if a fake_field is contained in search_opts
before calling swap_filter, but we can move it into the inside
of swap_filter.

This commit is split from https://review.openstack.org/#/c/507388/
to avoid doing a fix and refactoring in a single commit.

Co-Authored-By: Huan Xiong <huan.xiong@hxt-semitech.com>
Change-Id: I3069c6c9e66f32f53a64124f1d9d191d6aa703a3

openstack_dashboard/dashboards/admin/instances/views.py

@@ -66,11 +66,6 @@ def mks(args, **kvargs):
     return views.mks(args, **kvargs)
 
 
-# re-use get_resource_id_by_name from project.instances.views
-def swap_filter(resources, filters, fake_field, real_field):
-    return views.swap_filter(resources, filters, fake_field, real_field)
-
-
 class AdminUpdateView(views.UpdateView):
     workflow_class = update_instance.AdminUpdateInstance
     success_url = reverse_lazy("horizon:admin:instances:index")
@@ -172,18 +167,14 @@ class AdminIndexView(tables.DataTableView):
             e.submit(fn=_task_get_images)
             e.submit(fn=_task_get_flavors)
 
-        if 'project' in search_opts and \
+        non_api_filter_info = (
-                not swap_filter(tenants, search_opts, 'project', 'tenant_id'):
+            ('project', 'tenant_id', tenants),
-                self._more = False
+            ('image_name', 'image', images),
-                return instances
+            ('flavor_name', 'flavor', flavors),
-        elif 'image_name' in search_opts and \
+        )
-                not swap_filter(images, search_opts, 'image_name', 'image'):
+        if not views.process_non_api_filters(search_opts, non_api_filter_info):
-                self._more = False
+            self._more = False
-                return instances
+            return []
-        elif "flavor_name" in search_opts and \
-                not swap_filter(flavors, search_opts, 'flavor_name', 'flavor'):
-                self._more = False
-                return instances
 
         _task_get_instances()
 

openstack_dashboard/dashboards/project/instances/views.py

@@ -123,14 +123,13 @@ class IndexView(tables.DataTableView):
             e.submit(fn=_task_get_flavors)
             e.submit(fn=_task_get_images)
 
-        if 'image_name' in search_opts and \
+        non_api_filter_info = (
-                not swap_filter(images, search_opts, 'image_name', 'image'):
+            ('image_name', 'image', images),
+            ('flavor_name', 'flavor', flavors),
+        )
+        if not process_non_api_filters(search_opts, non_api_filter_info):
             self._more = False
-            return instances
+            return []
-        elif 'flavor_name' in search_opts and \
-                not swap_filter(flavors, search_opts, 'flavor_name', 'flavor'):
-            self._more = False
-            return instances
 
         _task_get_instances()
 
@@ -160,14 +159,39 @@ class IndexView(tables.DataTableView):
         return instances
 
 
-def swap_filter(resources, filters, fake_field, real_field):
+def process_non_api_filters(search_opts, non_api_filter_info):
-    if fake_field in filters:
+    """Process filters by non-API fields
-        filter_string = filters[fake_field]
+
-        for resource in resources:
+    There are cases where it is useful to provide a filter field
-            if resource.name.lower() == filter_string.lower():
+    which does not exist in a resource in a backend service.
-                filters[real_field] = resource.id
+    For example, nova server list provides 'image' field with image ID
-                del filters[fake_field]
+    but 'image name' is more useful for GUI users.
-                return True
+    This function replaces fake fields into corresponding real fields.
+
+    The format of non_api_filter_info is a tuple/list of
+    (fake_field, real_field, resources).
+
+    This returns True if further lookup is required.
+    It returns False if there are no matching resources,
+    for example, if no corresponding real field exists.
+    """
+    for fake_field, real_field, resources in non_api_filter_info:
+        if not _swap_filter(resources, search_opts, fake_field, real_field):
+            return False
+    return True
+
+
+def _swap_filter(resources, search_opts, fake_field, real_field):
+    if fake_field not in search_opts:
+        return True
+    filter_string = search_opts[fake_field]
+    matched = [resource for resource in resources
+               if resource.name.lower() == filter_string.lower()]
+    if not matched:
+        return False
+    search_opts[real_field] = matched[0].id
+    del search_opts[fake_field]
+    return True
 
 
 class LaunchInstanceView(workflows.WorkflowView):