sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-21 20:38:57 +00:00
Code Issues Releases Wiki Activity

Configuration: Made parameter lists public

Browse Source 
Renamed `__configuration` to `config_points` and in the case of
RunConfiguration it was split into `config_points` and `meta_data`
where `meta_data` contains config points for run meta data like
project name/stage ect.
This commit is contained in:
Sebastian Goscik 2016-09-26 15:23:59 +01:00
parent 9905bb3162
commit d7106acc42
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wlauto/core/configuration/configuration.py
View File

@ -574,10 +574,10 @@ def merge_using_priority_specificity(generic_name, specific_name, plugin_cache):
class Configuration(object): class Configuration(object):
__configuration = [] config_points = []
name = "" name = ""
# The below line must be added to all subclasses # The below line must be added to all subclasses
configuration = {cp.name: cp for cp in __configuration} configuration = {cp.name: cp for cp in config_points}
def __init__(self): def __init__(self):
# Load default values for configuration points # Load default values for configuration points
@ -623,7 +623,7 @@ class Configuration(object):
class WAConfiguration(Configuration): class WAConfiguration(Configuration):
name = "WA Configuration" name = "WA Configuration"
__configuration = [ config_points = [
ConfigurationPoint( ConfigurationPoint(
'user_directory', 'user_directory',
description=""" description="""
@ -715,7 +715,7 @@ class WAConfiguration(Configuration):
""", """,
), ),
] ]
configuration = {cp.name: cp for cp in __configuration} configuration = {cp.name: cp for cp in config_points}
@property @property
def dependencies_directory(self): def dependencies_directory(self):
@ -726,7 +726,9 @@ class WAConfiguration(Configuration):
class RunConfiguration(Configuration): class RunConfiguration(Configuration):
name = "Run Configuration" name = "Run Configuration"
__configuration = [
# Metadata is separated out because it is not loaded into the auto generated config file
meta_data = [
ConfigurationPoint('run_name', kind=str, ConfigurationPoint('run_name', kind=str,
description=''' description='''
A string that labels the WA run that is being performed. This would typically A string that labels the WA run that is being performed. This would typically
@ -747,6 +749,8 @@ class RunConfiguration(Configuration):
A dict or a string that allows adding additional identifier. This is may be A dict or a string that allows adding additional identifier. This is may be
useful for long-running projects. useful for long-running projects.
'''), '''),
]
config_points = [
ConfigurationPoint('execution_order', kind=str, default='by_iteration', ConfigurationPoint('execution_order', kind=str, default='by_iteration',
allowed_values=['by_iteration', 'by_spec', 'by_section', 'random'], allowed_values=['by_iteration', 'by_spec', 'by_section', 'random'],
description=''' description='''
@ -829,7 +833,7 @@ class RunConfiguration(Configuration):
.. note:: this number does not include the original attempt .. note:: this number does not include the original attempt
'''), '''),
] ]
configuration = {cp.name: cp for cp in __configuration} configuration = {cp.name: cp for cp in config_points + meta_data}
def __init__(self): def __init__(self):
super(RunConfiguration, self).__init__() super(RunConfiguration, self).__init__()
@ -879,7 +883,7 @@ class JobSpec(Configuration):
name = "Job Spec" name = "Job Spec"
__configuration = [ config_points = [
ConfigurationPoint('iterations', kind=int, default=1, ConfigurationPoint('iterations', kind=int, default=1,
description=''' description='''
How many times to repeat this workload spec How many times to repeat this workload spec
@ -915,7 +919,7 @@ class JobSpec(Configuration):
for results when post processing. for results when post processing.
'''), '''),
] ]
configuration = {cp.name: cp for cp in __configuration} configuration = {cp.name: cp for cp in config_points}
def __init__(self): def __init__(self):
super(JobSpec, self).__init__() super(JobSpec, self).__init__()