openstack/python-zunclient
Code Issues Proposed changes

Add image search default use driver 'docker'

Browse Source 
zun image search use 'docker' or 'glance' driver,
add default driver, if user not use image_driver,
the image search use default drvier 'docker'.

Change-Id: Idb5f9a8d6725258d498f9cfdb3fb1718c8abd018
Signed-off-by: Yuanbin.Chen <cybing4@gmail.com>
This commit is contained in:
Yuanbin.Chen
2018-06-16 22:37:47 +08:00
parent faa9528401
commit b861e19d20
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zunclient/tests/unit/v1/test_images_shell.py
View File

@@ -40,3 +40,19 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
self._test_arg_failure('image-show --wrong 1111',
self._unrecognized_arg_error)
self.assertFalse(mock_get.called)
@mock.patch('zunclient.v1.images.ImageManager.search_image')
def test_zun_image_search_with_driver(self, mock_search_image):
self._test_arg_success('image-search 111 --image_driver glance')
self.assertTrue(mock_search_image.called)
@mock.patch('zunclient.v1.images.ImageManager.search_image')
def test_zun_image_search_default_driver(self, mock_search_image):
self._test_arg_success('image-search 111')
self.assertTrue(mock_search_image.called)
@mock.patch('zunclient.v1.images.ImageManager.search_image')
def test_zun_image_search_failure(self, mock_search_image):
self._test_arg_failure('image-search --wrong 1111',
self._unrecognized_arg_error)
self.assertFalse(mock_search_image.called)

3
zunclient/v1/images_shell.py
View File

@@ -87,9 +87,10 @@ def do_image_delete(cs, args):
@utils.arg('image',
metavar='<image>',
help='Name of the image')
@utils.arg('image_driver',
@utils.arg('--image_driver',
metavar='<image-driver>',
choices=['glance', 'docker'],
default='docker',
help='Name of the image driver (glance, docker)')
@utils.arg('--exact-match',
default=False,