Merge "Add --metadata option to API v2 cinder list command again"

cinderclient/tests/unit/v2/test_shell.py

@@ -189,12 +189,6 @@ class ShellTest(utils.TestCase):
         self.run_command('list --name=1234')
         self.assert_called('GET', '/volumes/detail?name=1234')
 
-    def test_list_filter_image_metadata(self):
-        self.run_command('list --image_metadata image_name=1234')
-        url = ('/volumes/detail?%s' %
-               parse.urlencode([('glance_metadata', {"image_name": "1234"})]))
-        self.assert_called('GET', url)
-
     def test_list_all_tenants(self):
         self.run_command('list --all-tenants=1')
         self.assert_called('GET', '/volumes/detail?all_tenants=1')

cinderclient/v2/shell.py

@@ -65,7 +65,7 @@ from cinderclient.v2 import availability_zones
            default=None,
            help='Filters results by a migration status. Default=None. '
                 'Admin only.')
-@utils.arg('--image_metadata',
+@utils.arg('--metadata',
            type=str,
            nargs='*',
            metavar='<key=value>',
@@ -125,9 +125,8 @@ def do_list(cs, args):
         'status': args.status,
         'bootable': args.bootable,
         'migration_status': args.migration_status,
-        'glance_metadata': shell_utils.extract_metadata(args,
-                                                        type='image_metadata')
-        if args.image_metadata else None,
+        'metadata': (shell_utils.extract_metadata(args) if args.metadata
+                     else None),
     }
 
     # If unavailable/non-existent fields are specified, these fields will

cinderclient/v3/shell.py

@@ -75,15 +75,15 @@ from cinderclient.v2.shell import *  # flake8: noqa
            nargs='*',
            metavar='<key=value>',
            default=None,
-           help='Filters results by a metadata key and value pair. Require '
-                'volume api version >=3.4. Default=None.')
+           help='Filters results by a metadata key and value pair. '
+                'Default=None.')
 @utils.arg('--image_metadata',
            type=str,
            nargs='*',
            metavar='<key=value>',
            default=None,
-           help='Filters results by a image metadata key and value pair. '
-                'Default=None.')
+           help='Filters results by a image metadata key and value pair. Require '
+                'volume api version >=3.4. Default=None.')
 @utils.arg('--marker',
            metavar='<marker>',
            default=None,