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

Merge pull request #47991 from cbosdo/running-fix

Browse Source 
Running fix
This commit is contained in:
Nicole Thomas 2018-06-13 08:59:04 -04:00 committed by GitHub
commit b33c2252a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/states/virt.py
View File

@ -158,14 +158,14 @@ def _virt_call(domain, function, section, comment, **kwargs):
targeted_domains = fnmatch.filter(__salt__['virt.list_domains'](), domain)
changed_domains = list()
ignored_domains = list()
for domain in targeted_domains:
for targeted_domain in targeted_domains:
try:
response = __salt__['virt.{0}'.format(function)](domain, **kwargs)
response = __salt__['virt.{0}'.format(function)](targeted_domain, **kwargs)
if isinstance(response, dict):
response = response['name']
changed_domains.append({'domain': domain, function: response})
changed_domains.append({'domain': targeted_domain, function: response})
except libvirt.libvirtError as err:
ignored_domains.append({'domain': domain, 'issue': six.text_type(err)})
ignored_domains.append({'domain': targeted_domain, 'issue': six.text_type(err)})
if not changed_domains:
ret['result'] = False
ret['comment'] = 'No changes had happened'
@ -247,13 +247,17 @@ def running(name, **kwargs):
__salt__['virt.start'](name)
ret['changes'][name] = 'Domain started'
ret['comment'] = 'Domain {0} started'.format(name)
else:
ret['comment'] = 'Domain {0} exists and is running'.format(name)
except CommandExecutionError:
kwargs = salt.utils.args.clean_kwargs(**kwargs)
__salt__['virt.init'](name, cpu=cpu, mem=mem, image=image, **kwargs)
ret['changes'][name] = 'Domain defined and started'
ret['comment'] = 'Domain {0} defined and started'.format(name)
except libvirt.libvirtError:
ret['comment'] = 'Domain {0} exists and is running'.format(name)
except libvirt.libvirtError as err:
# Something bad happened when starting the VM, report it
ret['comment'] = six.text_type(err)
ret['result'] = False
return ret
@ -333,7 +337,7 @@ def saved(name, suffix=None):
return _virt_call(name, 'snapshot', 'saved', 'Snapshots has been taken', suffix=suffix)
def reverted(name, snapshot=None, cleanup=False):
def reverted(name, snapshot=None, cleanup=False): # pylint: disable=redefined-outer-name
'''
.. deprecated:: 2016.3.0

67
tests/unit/states/test_libvirt.py
View File

@ -2,6 +2,8 @@
'''
:codeauthor: Jayesh Kariya <jayeshk@saltstack.com>
'''
# pylint: disable=3rd-party-module-not-gated
# Import Python libs
from __future__ import absolute_import, print_function, unicode_literals
import tempfile
@ -23,13 +25,29 @@ import salt.states.virt as virt
import salt.utils.files
class LibvirtMock(MagicMock): # pylint: disable=too-many-ancestors
'''
libvirt library mockup
'''
class libvirtError(Exception): # pylint: disable=invalid-name
'''
libvirt error mockup
'''
@skipIf(NO_MOCK, NO_MOCK_REASON)
class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.states.libvirt
'''
def setup_loader_modules(self):
return {virt: {}}
self.mock_libvirt = LibvirtMock() # pylint: disable=attribute-defined-outside-init
self.addCleanup(delattr, self, 'mock_libvirt')
loader_globals = {
'libvirt': self.mock_libvirt
}
return {virt: loader_globals}
@classmethod
def setUpClass(cls):
@ -56,17 +74,17 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'],
{'libvirt.servercert.pem': 'A'}])
with patch.dict(virt.__salt__, {'pillar.ext': mock}):
with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member
comt = ('All keys are correct')
ret.update({'comment': comt})
self.assertDictEqual(virt.keys(name, basepath=self.pki_dir), ret)
with patch.dict(virt.__opts__, {'test': True}):
with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member
comt = ('Libvirt keys are set to be updated')
ret.update({'comment': comt, 'result': None})
self.assertDictEqual(virt.keys(name, basepath=self.pki_dir), ret)
with patch.dict(virt.__opts__, {'test': False}):
with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member
with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())):
comt = ('Updated libvirt certs and keys')
ret.update({'comment': comt, 'result': True,
@ -87,21 +105,21 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'],
{'libvirt.servercert.pem': 'A'}])
with patch.dict(virt.__salt__, {'pillar.ext': mock}):
with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member
comt = ('All keys are correct')
ret.update({'comment': comt})
self.assertDictEqual(virt.keys(name,
basepath=self.pki_dir,
expiration_days=700), ret)
with patch.dict(virt.__opts__, {'test': True}):
with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member
comt = ('Libvirt keys are set to be updated')
ret.update({'comment': comt, 'result': None})
self.assertDictEqual(virt.keys(name,
basepath=self.pki_dir,
expiration_days=700), ret)
with patch.dict(virt.__opts__, {'test': False}):
with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member
with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())):
comt = ('Updated libvirt certs and keys')
ret.update({'comment': comt, 'result': True,
@ -124,21 +142,21 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'],
{'libvirt.servercert.pem': 'A'}])
with patch.dict(virt.__salt__, {'pillar.ext': mock}):
with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member
comt = ('All keys are correct')
ret.update({'comment': comt})
self.assertDictEqual(virt.keys(name,
basepath=self.pki_dir,
st='California'), ret)
with patch.dict(virt.__opts__, {'test': True}):
with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member
comt = ('Libvirt keys are set to be updated')
ret.update({'comment': comt, 'result': None})
self.assertDictEqual(virt.keys(name,
basepath=self.pki_dir,
st='California'), ret)
with patch.dict(virt.__opts__, {'test': False}):
with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member
with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())):
comt = ('Updated libvirt certs and keys')
ret.update({'comment': comt, 'result': True,
@ -161,7 +179,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
mock = MagicMock(side_effect=[[], ['libvirt.servercert.pem'],
{'libvirt.servercert.pem': 'A'}])
with patch.dict(virt.__salt__, {'pillar.ext': mock}):
with patch.dict(virt.__salt__, {'pillar.ext': mock}): # pylint: disable=no-member
comt = ('All keys are correct')
ret.update({'comment': comt})
self.assertDictEqual(virt.keys(name,
@ -172,7 +190,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
organization='SaltStack',
expiration_days=700), ret)
with patch.dict(virt.__opts__, {'test': True}):
with patch.dict(virt.__opts__, {'test': True}): # pylint: disable=no-member
comt = ('Libvirt keys are set to be updated')
ret.update({'comment': comt, 'result': None})
self.assertDictEqual(virt.keys(name,
@ -183,7 +201,7 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
organization='SaltStack',
expiration_days=700), ret)
with patch.dict(virt.__opts__, {'test': False}):
with patch.dict(virt.__opts__, {'test': False}): # pylint: disable=no-member
with patch.object(salt.utils.files, 'fopen', MagicMock(mock_open())):
comt = ('Updated libvirt certs and keys')
ret.update({'comment': comt, 'result': True,
@ -195,3 +213,26 @@ class LibvirtTestCase(TestCase, LoaderModuleMockMixin):
locality='Los_Angeles',
organization='SaltStack',
expiration_days=700), ret)
def test_running(self):
'''
running state test cases.
'''
ret = {'name': 'myvm',
'changes': {},
'result': True,
'comment': 'myvm is running'}
with patch.dict(virt.__salt__, { # pylint: disable=no-member
'virt.vm_state': MagicMock(return_value='stopped'),
'virt.start': MagicMock(return_value=0)
}):
ret.update({'changes': {'myvm': 'Domain started'},
'comment': 'Domain myvm started'})
self.assertDictEqual(virt.running('myvm'), ret)
with patch.dict(virt.__salt__, { # pylint: disable=no-member
'virt.vm_state': MagicMock(return_value='stopped'),
'virt.start': MagicMock(side_effect=[self.mock_libvirt.libvirtError('libvirt error msg')])
}):
ret.update({'changes': {}, 'result': False, 'comment': 'libvirt error msg'})
self.assertDictEqual(virt.running('myvm'), ret)