Merge "Remove playbook param from run_validation"
This commit is contained in:
commit
34b562cde1
|
@ -129,7 +129,9 @@ class TestValidationActions(TestCase):
|
||||||
validations_dir='/tmp/foo')
|
validations_dir='/tmp/foo')
|
||||||
self.assertEqual(run_return, expected_run_return)
|
self.assertEqual(run_return, expected_run_return)
|
||||||
|
|
||||||
def test_validation_run_no_validation(self):
|
@mock.patch('validations_libs.utils.get_validations_playbook',
|
||||||
|
return_value=[])
|
||||||
|
def test_validation_run_no_validation(self, mock_get_val):
|
||||||
playbook = ['fake.yaml']
|
playbook = ['fake.yaml']
|
||||||
inventory = 'tmp/inventory.yaml'
|
inventory = 'tmp/inventory.yaml'
|
||||||
|
|
||||||
|
|
|
@ -58,25 +58,15 @@ class ValidationActions(object):
|
||||||
data.update(format)
|
data.update(format)
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def run_validations(self, playbook=[], inventory='localhost',
|
def run_validations(self, validation_name=None, inventory='localhost',
|
||||||
group=None, extra_vars=None, validations_dir=None,
|
group=None, extra_vars=None, validations_dir=None,
|
||||||
validation_name=None, extra_env_vars=None,
|
extra_env_vars=None, ansible_cfg=None, quiet=True,
|
||||||
ansible_cfg=None, quiet=True, workdir=None,
|
workdir=None, limit_hosts=None, run_async=False,
|
||||||
limit_hosts=None, run_async=False,
|
|
||||||
base_dir=constants.DEFAULT_VALIDATIONS_BASEDIR):
|
base_dir=constants.DEFAULT_VALIDATIONS_BASEDIR):
|
||||||
self.log = logging.getLogger(__name__ + ".run_validations")
|
self.log = logging.getLogger(__name__ + ".run_validations")
|
||||||
playbooks = []
|
playbooks = []
|
||||||
validations_dir = (validations_dir if validations_dir
|
validations_dir = (validations_dir if validations_dir
|
||||||
else self.validation_path)
|
else self.validation_path)
|
||||||
|
|
||||||
if playbook:
|
|
||||||
if isinstance(playbook, list):
|
|
||||||
playbooks = playbook
|
|
||||||
elif isinstance(playbook, str):
|
|
||||||
playbooks = [playbook]
|
|
||||||
else:
|
|
||||||
raise TypeError("Playbooks should be a List or a Str")
|
|
||||||
|
|
||||||
if group:
|
if group:
|
||||||
self.log.debug('Getting the validations list by group')
|
self.log.debug('Getting the validations list by group')
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue