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

added option "test" - not yet well tested :D

Browse Source
This commit is contained in:
Florian Ermisch 2015-07-28 12:51:50 +02:00
parent 076f20cbbe
commit 95db1d603a
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
salt/states/glance.py
View File

@ -75,9 +75,21 @@ def image_present(name, visibility='public', protected=None,
acceptable.pop(0) acceptable.pop(0)
image, msg = _find_image(name) image, msg = _find_image(name)
if image is False:
if __opts__['test']:
ret['result'] = None
else:
ret['result'] = False
ret['comment'] = msg
return ret
log.debug(msg) log.debug(msg)
# No image yet and we know where to get one # No image yet and we know where to get one
if image is None and location is not None: if image is None and location is not None:
if __opts__['test']:
ret['result'] = None
ret['comment'] = 'glance.image_present would ' \
'create an image from {0}'.format(location)
return ret
image = __salt__['glance.image_create'](name=name, image = __salt__['glance.image_create'](name=name,
protected=protected, visibility=visibility, protected=protected, visibility=visibility,
location=location) location=location)
@ -129,8 +141,13 @@ def image_present(name, visibility='public', protected=None,
# There's no image but where would I get one?? # There's no image but where would I get one??
elif location is None: elif location is None:
ret['result'] = False if __opts__['test']:
ret['comment'] = 'No location to copy image from specified,\n' +\ ret['result'] = None
ret['comment'] = 'No location to copy image from specified,\n' +\
'glance.image_present would not create one'
else:
ret['result'] = False
ret['comment'] = 'No location to copy image from specified,\n' +\
'not creating a new image.' 'not creating a new image.'
return ret return ret
@ -139,8 +156,11 @@ def image_present(name, visibility='public', protected=None,
ret['changes'][name]['new']['status'] = image['status'] ret['changes'][name]['new']['status'] = image['status']
if visibility: if visibility:
if image['visibility'] != visibility: if not __opts__['test'] and \
image['visibility'] != visibility:
ret['result'] = False ret['result'] = False
elif __opts__['test']:
ret['result'] = None
ret['comment'] += '"visibility" is {0}, should be {1}.\n'.format( ret['comment'] += '"visibility" is {0}, should be {1}.\n'.format(
image['visibility'], visibility) image['visibility'], visibility)
else: else:
@ -148,7 +168,10 @@ def image_present(name, visibility='public', protected=None,
visibility) visibility)
if protected is not None: if protected is not None:
if not isinstance(protected, bool) or image['protected'] ^ protected: if not isinstance(protected, bool) or image['protected'] ^ protected:
ret['result'] = False if not __opts__['test']:
ret['result'] = False
else:
ret['result'] = None
ret['comment'] += '"protected" is {0}, should be {1}.\n'.format( ret['comment'] += '"protected" is {0}, should be {1}.\n'.format(
image['protected'], protected) image['protected'], protected)
else: else:
@ -157,11 +180,17 @@ def image_present(name, visibility='public', protected=None,
if 'status' in image and checksum: if 'status' in image and checksum:
if image['status'] == 'active': if image['status'] == 'active':
if 'checksum' not in image: if 'checksum' not in image:
ret['result'] = False if not __opts__['test']:
ret['result'] = False
else:
ret['result'] = None
ret['comment'] += 'No checksum available for this image:\n' +\ ret['comment'] += 'No checksum available for this image:\n' +\
'\tImage has status "{0}".'.format(image['status']) '\tImage has status "{0}".'.format(image['status'])
elif image['checksum'] != checksum: elif image['checksum'] != checksum:
ret['result'] = False if not __opts__['test']:
ret['result'] = False
else:
ret['result'] = None
ret['comment'] += '"checksum" is {0}, should be {1}.\n'.format( ret['comment'] += '"checksum" is {0}, should be {1}.\n'.format(
image['checksum'], checksum) image['checksum'], checksum)
else: else: