sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-22 12:58:36 +00:00
Code Issues Releases Wiki Activity

framework/config: plug_cache: handle aliases

Browse Source 
Use get_config_point_map() when returning parameter mappings to ensure
aliases are included.
This commit is contained in:
Sergei Trofimov 2017-11-29 11:37:08 +00:00 committed by marcbonnici
parent 78a569a2d3
commit a7a5d09dfa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wa/framework/configuration/plugin_cache.py
View File

@ -19,6 +19,7 @@ from itertools import chain
from devlib.utils.misc import memoized from devlib.utils.misc import memoized
from wa.framework import pluginloader from wa.framework import pluginloader
from wa.framework.configuration.core import get_config_point_map
from wa.framework.exception import ConfigError from wa.framework.exception import ConfigError
from wa.framework.target.descriptor import get_target_descriptions from wa.framework.target.descriptor import get_target_descriptions
from wa.utils.types import obj_dict from wa.utils.types import obj_dict
@ -140,7 +141,7 @@ class PluginCache(object):
if name in self.targets: if name in self.targets:
return self._get_target_params(name) return self._get_target_params(name)
params = self.loader.get_plugin_class(name).parameters params = self.loader.get_plugin_class(name).parameters
return {param.name: param for param in params} return get_config_point_map(params)
def _set_plugin_defaults(self, plugin_name, config): def _set_plugin_defaults(self, plugin_name, config):
cfg_points = self.get_plugin_parameters(plugin_name) cfg_points = self.get_plugin_parameters(plugin_name)
@ -158,9 +159,7 @@ class PluginCache(object):
def _get_target_params(self, name): def _get_target_params(self, name):
td = self.targets[name] td = self.targets[name]
params = {p.name: p for p in chain(td.target_params, td.platform_params, td.conn_params)} return get_config_point_map(chain(td.target_params, td.platform_params, td.conn_params))
#params['connection_settings'] = {p.name: p for p in td.conn_params}
return params
# pylint: disable=too-many-nested-blocks, too-many-branches # pylint: disable=too-many-nested-blocks, too-many-branches
def _merge_using_priority_specificity(self, specific_name, def _merge_using_priority_specificity(self, specific_name,