openstack/python-cinderclient
Code Issues Proposed changes

Merge "Add start_version check for do_list() image_metadata option"

Browse Source
This commit is contained in:
Jenkins
2017-02-10 16:38:29 +00:00
committed by Gerrit Code Review
parent 7d4c8fe489 4cd05c64dd
commit b8a3ef936e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cinderclient/tests/unit/v3/test_shell.py
View File

@@ -385,8 +385,13 @@ class ShellTest(utils.TestCase):
self.run_command('--os-volume-api-version 3.5 message-list --marker=1') self.run_command('--os-volume-api-version 3.5 message-list --marker=1')
self.assert_called('GET', '/messages?marker=1') self.assert_called('GET', '/messages?marker=1')
def test_list_with_image_metadata_before_3_4(self):
self.assertRaises(exceptions.UnsupportedAttribute,
self.run_command,
'list --image_metadata image_name=1234')
def test_list_filter_image_metadata(self): def test_list_filter_image_metadata(self):
self.run_command('--os-volume-api-version 3.0 ' self.run_command('--os-volume-api-version 3.4 '
'list --image_metadata image_name=1234') 'list --image_metadata image_name=1234')
url = ('/volumes/detail?%s' % url = ('/volumes/detail?%s' %
parse.urlencode([('glance_metadata', {"image_name": "1234"})])) parse.urlencode([('glance_metadata', {"image_name": "1234"})]))

3
cinderclient/v3/shell.py
View File

@@ -82,6 +82,7 @@ from cinderclient.v2.shell import * # flake8: noqa
nargs='*', nargs='*',
metavar='<key=value>', metavar='<key=value>',
default=None, default=None,
start_version='3.4',
help='Filters results by a image metadata key and value pair. Require ' help='Filters results by a image metadata key and value pair. Require '
'volume api version >=3.4. Default=None.') 'volume api version >=3.4. Default=None.')
@utils.arg('--marker', @utils.arg('--marker',
@@ -141,7 +142,7 @@ def do_list(cs, args):
if args.metadata else None, if args.metadata else None,
'glance_metadata': shell_utils.extract_metadata(args, 'glance_metadata': shell_utils.extract_metadata(args,
type='image_metadata') type='image_metadata')
if args.image_metadata else None, if hasattr(args, 'image_metadata') and args.image_metadata else None,
'group_id': getattr(args, 'group_id', None), 'group_id': getattr(args, 'group_id', None),
} }