mirror of
https://github.com/ARM-software/workload-automation.git
synced 2025-04-14 06:40:52 +01:00
framework/output: improve access to config
Make it easier to access a run's configuration but automatically deserializing it on reload of RunOutput, and exposing it via appropriate settings.
This commit is contained in:
parent
e3b3799737
commit
03328f0456
@ -162,12 +162,23 @@ class RunOutput(Output):
|
|||||||
path = os.path.join(self.basepath, '__failed')
|
path = os.path.join(self.basepath, '__failed')
|
||||||
return ensure_directory_exists(path)
|
return ensure_directory_exists(path)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def run_config(self):
|
||||||
|
if self._combined_config:
|
||||||
|
return self._combined_config.run_config
|
||||||
|
|
||||||
|
@property
|
||||||
|
def settings(self):
|
||||||
|
if self._combined_config:
|
||||||
|
return self._combined_config.settings
|
||||||
|
|
||||||
def __init__(self, path):
|
def __init__(self, path):
|
||||||
super(RunOutput, self).__init__(path)
|
super(RunOutput, self).__init__(path)
|
||||||
self.info = None
|
self.info = None
|
||||||
self.state = None
|
self.state = None
|
||||||
self.result = None
|
self.result = None
|
||||||
self.target_info = None
|
self.target_info = None
|
||||||
|
self._combined_config = None
|
||||||
self.jobs = []
|
self.jobs = []
|
||||||
if (not os.path.isfile(self.statefile) or
|
if (not os.path.isfile(self.statefile) or
|
||||||
not os.path.isfile(self.infofile)):
|
not os.path.isfile(self.infofile)):
|
||||||
@ -179,6 +190,8 @@ class RunOutput(Output):
|
|||||||
super(RunOutput, self).reload()
|
super(RunOutput, self).reload()
|
||||||
self.info = RunInfo.from_pod(read_pod(self.infofile))
|
self.info = RunInfo.from_pod(read_pod(self.infofile))
|
||||||
self.state = RunState.from_pod(read_pod(self.statefile))
|
self.state = RunState.from_pod(read_pod(self.statefile))
|
||||||
|
if os.path.isfile(self.configfile):
|
||||||
|
self._combined_config = CombinedConfig.from_pod(read_pod(self.configfile))
|
||||||
if os.path.isfile(self.targetfile):
|
if os.path.isfile(self.targetfile):
|
||||||
self.target_info = TargetInfo.from_pod(read_pod(self.targetfile))
|
self.target_info = TargetInfo.from_pod(read_pod(self.targetfile))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user