diff --git a/validations_libs/tests/test_validation_actions.py b/validations_libs/tests/test_validation_actions.py index 656274d5..0952ac70 100644 --- a/validations_libs/tests/test_validation_actions.py +++ b/validations_libs/tests/test_validation_actions.py @@ -204,7 +204,7 @@ class TestValidationActions(TestCase): v_actions = ValidationActions() self.assertRaises(RuntimeError, v_actions.show_validations_parameters, - validation='foo', format='bar') + validation='foo', output_format='bar') @mock.patch('validations_libs.validation_logs.ValidationLogs.' 'get_logfile_by_validation', diff --git a/validations_libs/validation.py b/validations_libs/validation.py index 17607c82..39a26260 100644 --- a/validations_libs/validation.py +++ b/validations_libs/validation.py @@ -172,9 +172,9 @@ class Validation(object): 'var_name2': 'value2'} """ if self.has_metadata_dict: - vars = self.dict['vars'].copy() - vars.pop('metadata') - return vars + validation_vars = self.dict['vars'].copy() + validation_vars.pop('metadata') + return validation_vars else: raise NameError( "No metadata found in validation {}".format(self.id) diff --git a/validations_libs/validation_actions.py b/validations_libs/validation_actions.py index 6986b3c9..928f2cb3 100644 --- a/validations_libs/validation_actions.py +++ b/validations_libs/validation_actions.py @@ -125,8 +125,8 @@ class ValidationActions(object): self.validation_path) raise RuntimeError(msg) logfiles = vlog.get_logfile_content_by_validation(validation) - format = vlog.get_validations_stats(logfiles) - data.update(format) + data_format = vlog.get_validations_stats(logfiles) + data.update(data_format) return data def run_validations(self, validation_name=None, inventory='localhost', @@ -324,7 +324,7 @@ class ValidationActions(object): return (column_name, group_info) def show_validations_parameters(self, validation=None, group=None, - format='json', download_file=None): + output_format='json', download_file=None): """ Return Validations Parameters for one or several validations by their names or their groups. @@ -335,8 +335,8 @@ class ValidationActions(object): :param group: List of validation group(s) :type group: `list` - :param format: Output format (Supported format are JSON or YAML) - :type format: `string` + :param output_format: Output format (Supported format are JSON or YAML) + :type output_format: `string` :param download_file: Path of a file in which the parameters will be stored @@ -349,8 +349,8 @@ class ValidationActions(object): >>> validation = ['check-cpu', 'check-ram'] >>> group = None - >>> format = 'json' - >>> show_validations_parameters(validation, group, format) + >>> output_format = 'json' + >>> show_validations_parameters(validation, group, output_format) { "check-cpu": { "parameters": { @@ -372,8 +372,8 @@ class ValidationActions(object): supported_format = ['json', 'yaml'] - if format not in supported_format: - raise RuntimeError("{} format not supported".format(format)) + if output_format not in supported_format: + raise RuntimeError("{} output format not supported".format(output_format)) validations = v_utils.get_validations_playbook( self.validation_path, validation, group) @@ -386,7 +386,7 @@ class ValidationActions(object): for k, v in params[val_name].get('parameters').items(): params_only[k] = v - if format == 'json': + if output_format == 'json': f.write(json.dumps(params_only, indent=4, sort_keys=True)) @@ -395,7 +395,7 @@ class ValidationActions(object): allow_unicode=True, default_flow_style=False, indent=2)) - if format == 'json': + if output_format == 'json': return json.dumps(params, indent=4, sort_keys=True) diff --git a/validations_libs/validation_logs.py b/validations_libs/validation_logs.py index 44596048..d274917e 100644 --- a/validations_libs/validation_logs.py +++ b/validations_libs/validation_logs.py @@ -472,12 +472,12 @@ class ValidationLogs(object): """ if isinstance(uuid, list): results = [] - for id in uuid: + for identifier in uuid: results.extend(self.get_logfile_by_uuid_validation_id( - id, + identifier, validation_id) if validation_id else - self.get_logfile_by_uuid(id)) + self.get_logfile_by_uuid(identifier)) elif isinstance(uuid, str): results = (self.get_logfile_by_uuid_validation_id(uuid, validation_id)