openstack/validations-libs
Code Issues Proposed changes

Remove output format test in utils.get_validations_parameters

Browse Source 
This is now done in validation_actions.show_validations_parameters(..)
[1].

[1] https://opendev.org/openstack/validations-libs/src/branch/master/validations_libs/validation_actions.py#L206-L209

Change-Id: I9f90ba97758422a35280b91e6d3edae624564728
Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud (Strider) 2020-11-09 14:03:51 +01:00
parent 63e30c744c
commit 484d7a9a78
No known key found for this signature in database
GPG Key ID: 4119D0305C651D66
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
validations_libs/tests/test_utils.py
View File

@ -155,26 +155,6 @@ class TestUtils(TestCase):
output = {'foo': {'parameters': {'foo': 'bar'}}} output = {'foo': {'parameters': {'foo': 'bar'}}}
self.assertEqual(result, output) self.assertEqual(result, output)
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2)
@mock.patch('six.moves.builtins.open')
def test_get_validations_parameters_yaml(self, mock_open, mock_load):
result = utils.get_validations_parameters(
validations_data=['/foo/playbook/foo.yaml'],
validation_name='foo',
format='yaml')
output = {'foo': {'parameters': {'foo': 'bar'}}}
self.assertEqual(result, output)
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2)
@mock.patch('six.moves.builtins.open')
def test_get_validations_parameters_wrong_format(self, mock_open,
mock_load):
self.assertRaises(RuntimeError, utils.get_validations_parameters,
validations_data=['/foo/playbook/foo.yaml'],
validation_name='foo',
format='wrong')
@mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2) @mock.patch('yaml.safe_load', return_value=fakes.FAKE_PLAYBOOK2)
@mock.patch('six.moves.builtins.open') @mock.patch('six.moves.builtins.open')
def test_get_validations_parameters_no_val(self, mock_open, mock_load): def test_get_validations_parameters_no_val(self, mock_open, mock_load):

5
validations_libs/utils.py
View File

@ -160,7 +160,7 @@ def get_validations_data(validation, path=constants.ANSIBLE_VALIDATION_DIR):
def get_validations_parameters(validations_data, validation_name=[], def get_validations_parameters(validations_data, validation_name=[],
groups=[], format='json'): groups=[]):
""" """
Return parameters for a list of validations Return parameters for a list of validations
The return format can be in json or yaml The return format can be in json or yaml
@ -172,9 +172,6 @@ def get_validations_parameters(validations_data, validation_name=[],
params[v.id] = { params[v.id] = {
'parameters': v.get_vars 'parameters': v.get_vars
} }
if format not in ['json', 'yaml']:
msg = 'Invalid output format, {} is not supported'.format(format)
raise RuntimeError(msg)
return params return params

2
validations_libs/validation_actions.py
View File

@ -211,7 +211,7 @@ class ValidationActions(object):
validations = v_utils.get_validations_playbook( validations = v_utils.get_validations_playbook(
self.validation_path, validation, group) self.validation_path, validation, group)
params = v_utils.get_validations_parameters(validations, validation, params = v_utils.get_validations_parameters(validations, validation,
group, format) group)
if download_file: if download_file:
params_only = {} params_only = {}
with open(download_file, 'w') as f: with open(download_file, 'w') as f: