valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add optional parameter "name"

Browse Source 
As states are identified by names and not random
IDs we don't want to have to check for a not-yet-
known value.
This commit is contained in:
Florian Ermisch 2015-07-28 12:47:38 +02:00
parent 4717341dcf
commit 076f20cbbe
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/glance.py
View File

@ -259,7 +259,7 @@ def image_show(id=None, name=None, profile=None): # pylint: disable=C0103
return ret
def image_list(id=None, profile=None): # pylint: disable=C0103
def image_list(id=None, name=None, profile=None): # pylint: disable=C0103
'''
Return a list of available images (glance image-list)
@ -273,6 +273,9 @@ def image_list(id=None, profile=None): # pylint: disable=C0103
ret = {}
# TODO: Get rid of the wrapping dict, see #24568
for image in g_client.images.list():
# might be reasonable not to build this
# potentially large dict when we're
# looking for _one_ particular image
ret[image.name] = {
'id': image.id,
'name': image.name,
@ -293,6 +296,9 @@ def image_list(id=None, profile=None): # pylint: disable=C0103
ret[image.name][attr] = image[attr]
if id == image.id:
return ret[image.name]
if name == image.name:
return ret[image.name]
log.debug('Returning image: {0}'.format(ret))
return ret