sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-06-20 07:16:11 +01:00
Code Issues Releases Wiki Activity

framework/config: rename instrumenation --> augmentations

Browse Source 
Rename ConfigurationPoint "instrumenation" to "augmentations". Unlike
WA2, in W3, instruments and result_porcessors are handled identically in
configuration (though there're still distinct pulgin types).
"instrumentation" and "result_porcessors" entries in configuration are
now aliases for the same configuration point, which is renamed to
"augmentations" to reflect the fact that it contains both types of
plugins.
This commit is contained in:
Sergei Trofimov
2017-11-03 15:52:49 +00:00
committed by setrofim
parent 2ff1a87e53
commit 337c5e5e1d
2 changed files with 16 additions and 12 deletions
wa/framework/configuration
core.pyparsers.py

8
wa/framework/configuration/parsers.py

@ -207,7 +207,7 @@ def _load_file(filepath, error_name):
def merge_result_processors_instruments(raw):
instr_config = JobSpec.configuration['instrumentation']
instr_config = JobSpec.configuration['augmentations']
instruments = toggle_set(pop_aliased_param(instr_config, raw, default=[]))
result_processors = toggle_set(raw.pop('result_processors', []))
if instruments and result_processors:
@ -217,7 +217,7 @@ def merge_result_processors_instruments(raw):
'conflicting entries: {}'
entires = ', '.join('"{}"'.format(c.strip("~")) for c in conflicts)
raise ConfigError(msg.format(entires))
raw['instrumentation'] = instruments.merge_with(result_processors)
raw['augmentations'] = instruments.merge_with(result_processors)
def _pop_aliased(d, names, entry_id):
@ -257,8 +257,8 @@ def _construct_valid_entry(raw, seen_ids, prefix, jobs_config):
cfg_point.validate_value(name, value)
workload_entry[name] = value
if "instrumentation" in workload_entry:
jobs_config.update_enabled_instruments(workload_entry["instrumentation"])
if "augmentations" in workload_entry:
jobs_config.update_enabled_augmentations(workload_entry["augmentations"])
# error if there are unknown workload_entry
if raw: