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

created own function _find_image() to resolve image names

Browse Source
This commit is contained in:
Florian Ermisch 2015-07-15 16:55:13 +02:00
parent 0275615f33
commit 5343bf1789
1 changed files with 106 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
salt/states/glance.py
View File

@ -8,59 +8,126 @@ import logging
log = logging.getLogger(__name__)
def image_present(name, visibility=None, protected=None, checksum=None):
def _find_image(name):
'''
Tries to find image with given name, returns
- image, 'Found image <name>'
- None, 'No such image found'
- False, 'Found more than one image with given name'
'''
images_dict = __salt__['glance.image_list'](name=name)
log.debug('Got images_dict: {0}'.format(images_dict))
if len(images_dict) == 1 and 'images' in images_dict:
images_dict = images_dict['images']
if len(images_dict) == 0:
return None, 'No image with name "{0}"'.format(name)
elif len(images_dict) == 1:
return images_dict.values()[0], 'Found image {0}'.format(name)
elif len(images_dict) > 1:
return False, 'Found more than one image with given name'
else:
raise NotImplementedError
def image_present(name, visibility='public', protected=None,
checksum=None, location=None, wait_for=None, timeout=30):
'''
Checks if given image is present with properties
set as specified.
An image should got through the stages 'queued', 'saving'
before becoming 'active'. The attribute 'checksum' can
only be checked once the image is active.
If you don't specify 'wait_for' but 'checksum' the function
will wait for the image to become active before comparing
checksums. If you don't specify checksum either the function
will return when the image reached 'saving'.
The default timeout for both is 30 seconds.
Supported properties:
- visibility ('public' or 'private')
- protected (bool)
- checksum (string, md5sum)
- location (URL, to copy from)
'''
ret = {'name': name,
'changes': {},
'result': True,
'comment': '',
}
images_dict = __salt__['glance.image_list'](name=name)
log.debug('Got images_dict: {0}'.format(images_dict))
if len(images_dict) == 1 and 'images' in images_dict:
images_dict = images_dict['images']
if len(images_dict) == 0:
ret['result'] = False
ret['comment'] = 'No image with name "{0}"'.format(name)
elif len(images_dict) == 1:
if len(images_dict) == 1:
image = images_dict[images_dict.keys()[0]]
acceptable = ['queued', 'saving', 'active']
if wait_for is None and checksum is None:
wait_for = 'saving'
elif wait_for is None and checksum is not None:
wait_for = 'active'
elif wait_for in ['saving', 'queued'] and checksum is not None:
ret['warning'] = "Can't verify checksum until image is in " +\
"state 'active'!"
# Just pop states until we reach the
# first acceptable one:
for state in acceptable:
if state == wait_for:
break
else:
image = images_dict[0]
if visibility:
if image['visibility'] != visibility:
ret['result'] = False
ret['comment'] += '"visibility" is {0}, should be {1}.\n'.format(
image['visibility'], visibility)
acceptable.pop(0)
image, msg = _find_image(name)
log.debug(msg)
# No image yet and we know where to get one
if image is None and location is not None:
image = __salt__['glance.image_create'](name=name,
protected=protected, visibility=visibility, location=location)
log.debug('Created new image:\n{0}'.format(image))
timer = timeout
# Kinda busy-loopy but I don't think the Glance
# API has events we can listen for
while timer > 0:
if image['status'] in acceptable:
break
else:
ret['comment'] += '"visibility" is correct ({0}).\n'.format(
visibility)
if protected is not None:
if not isinstance(protected, bool) or image['protected'] ^ protected:
ret['result'] = False
ret['comment'] += '"protected" is {0}, should be {1}.\n'.format(
image['protected'], protected)
else:
ret['comment'] += '"protected" is correct ({0}).\n'.format(
protected)
if checksum:
if image['checksum'] != checksum:
ret['result'] = False
ret['comment'] += '"checksum" is {0}, should be {1}.\n'.format(
image['checksum'], checksum)
else:
ret['comment'] += '"checksum" is correct ({0}).\n'.format(
checksum)
else:
raise NotImplementedError
timer -= 5
time.sleep(5)
image = _find_image(name)
# Wrapped dict workaround (see Salt issue #24568)
if name in image:
image = image[name]
# ret[comment] +=
# There's no image but where would I get one??
elif location is None:
ret['result'] = False
ret['comment'] = 'No location to copy image from specified,\n' +\
'not creating a new image.'
return ret
if visibility:
if image['visibility'] != visibility:
ret['result'] = False
ret['comment'] += '"visibility" is {0}, should be {1}.\n'.format(
image['visibility'], visibility)
else:
ret['comment'] += '"visibility" is correct ({0}).\n'.format(
visibility)
if protected is not None:
if not isinstance(protected, bool) or image['protected'] ^ protected:
ret['result'] = False
ret['comment'] += '"protected" is {0}, should be {1}.\n'.format(
image['protected'], protected)
else:
ret['comment'] += '"protected" is correct ({0}).\n'.format(
protected)
if wait_for == 'active' and checksum:
if not image.has_key('checksum'):
ret['result'] = False
ret['comment'] += 'No checksum available for this image.\n'
elif image['checksum'] != checksum:
ret['result'] = False
ret['comment'] += '"checksum" is {0}, should be {1}.\n'.format(
image['checksum'], checksum)
else:
ret['comment'] += '"checksum" is correct ({0}).\n'.format(
checksum)
return ret