image/v2: support multiple property filters

Sven Wegener · Sven Wegener · commit 21e4c87bdeb7 · 2018-11-07T14:55:51.000+01:00
Change-Id: I8ba40cb8ca647ec24b80c2824bb64e84430535d4
Signed-off-by: Sven Wegener &lt;sven.wegener@inovex.de&gt;
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
@@ -515,7 +515,8 @@ def get_parser(self, prog_name):
             '--property',
             metavar='<key=value>',
             action=parseractions.KeyValueAction,
-            help=_('Filter output based on property'),
+            help=_('Filter output based on property '
+                   '(repeat option to filter on multiple properties)'),
         )
         parser.add_argument(
             '--name',
@@ -643,14 +644,13 @@ def take_action(self, parsed_args):
                 marker = page[-1]['id']
 
         if parsed_args.property:
-            # NOTE(dtroyer): coerce to a list to subscript it in py3
-            attr, value = list(parsed_args.property.items())[0]
-            api_utils.simple_filter(
-                data,
-                attr=attr,
-                value=value,
-                property_field='properties',
-            )
+            for attr, value in parsed_args.property.items():
+                api_utils.simple_filter(
+                    data,
+                    attr=attr,
+                    value=value,
+                    property_field='properties',
+                )
 
         data = utils.sort_items(data, parsed_args.sort, str)
 
diff --git a/releasenotes/notes/image-list-filter-multiple-properties-03c51d43131ee3b6.yaml b/releasenotes/notes/image-list-filter-multiple-properties-03c51d43131ee3b6.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    The ``image list`` command now properly filters images on multiple
+    ``--property`` options.
+    [Bug `2004290 <https://storyboard.openstack.org/#!/story/2004290>`_]
