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

Merge pull request #26342 from rallytime/fix-16049

Browse Source 
Don't call boto_elb._attributes_present if no attributes were provided
This commit is contained in:
Mike Place 2015-08-17 13:19:08 -06:00
commit 8bb57d1631
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
salt/states/boto_elb.py
View File

@ -193,7 +193,11 @@ Overriding the alarm values on the resource:
attributes: attributes:
threshold: 2.0 threshold: 2.0
''' '''
# Import Python Libs
from __future__ import absolute_import from __future__ import absolute_import
# Import Salt Libs
import salt.utils.dictupdate as dictupdate import salt.utils.dictupdate as dictupdate
from salt.exceptions import SaltInvocationError from salt.exceptions import SaltInvocationError
import salt.ext.six as six import salt.ext.six as six
@ -302,13 +306,17 @@ def present(
ret['result'] = _ret['result'] ret['result'] = _ret['result']
if ret['result'] is False: if ret['result'] is False:
return ret return ret
_ret = _attributes_present(name, attributes, region, key, keyid, profile)
ret['changes'] = dictupdate.update(ret['changes'], _ret['changes']) if attributes:
ret['comment'] = ' '.join([ret['comment'], _ret['comment']]) _ret = _attributes_present(name, attributes, region, key, keyid, profile)
if not _ret['result']: ret['changes'] = dictupdate.update(ret['changes'], _ret['changes'])
ret['result'] = _ret['result'] ret['comment'] = ' '.join([ret['comment'], _ret['comment']])
if ret['result'] is False:
return ret if not _ret['result']:
ret['result'] = _ret['result']
if ret['result'] is False:
return ret
_ret = _health_check_present(name, health_check, region, key, keyid, _ret = _health_check_present(name, health_check, region, key, keyid,
profile) profile)
ret['changes'] = dictupdate.update(ret['changes'], _ret['changes']) ret['changes'] = dictupdate.update(ret['changes'], _ret['changes'])

2
tests/unit/states/boto_elb_test.py
View File

@ -98,7 +98,7 @@ class BotoElbTestCase(TestCase):
self.assertTrue(boto_elb.__salt__['boto_elb.exists'].called) self.assertTrue(boto_elb.__salt__['boto_elb.exists'].called)
self.assertTrue(boto_elb.__salt__['boto_elb.create'].called) self.assertTrue(boto_elb.__salt__['boto_elb.create'].called)
self.assertTrue(boto_elb.__salt__['state.single'].called) self.assertTrue(boto_elb.__salt__['state.single'].called)
self.assertTrue( self.assertFalse(
boto_elb.__salt__['boto_elb.get_attributes'].called boto_elb.__salt__['boto_elb.get_attributes'].called
) )
self.assertTrue( self.assertTrue(