summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-08 05:40:17 +0000
committerGerrit Code Review <review@openstack.org>2018-11-08 05:40:17 +0000
commit9b1e5f052eb15d1fa2777ffd8b5134fe9ab69858 (patch)
tree2f73578636ab8465f9618ffe1d1e22d45f6da1a9 /openstackclient
parent013c9a4f3a44cb0b81fc7affe9b933e701cb5dba (diff)
parent21e4c87bdeb78ef5c5a251ae9e671efd1b5e3102 (diff)
downloadpython-openstackclient-9b1e5f052eb15d1fa2777ffd8b5134fe9ab69858.tar.gz
Merge "image/v2: support multiple property filters"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/image/v2/image.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 1e67692a..06eebe98 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -515,7 +515,8 @@ class ListImage(command.Lister):
'--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 @@ class ListImage(command.Lister):
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)