1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2024-10-06 10:51:13 +01:00

EnergyMeasurement: Removes parameter defaults

The instrument baseclass expects None for not defined parameters
instead of empty containers.
This commit is contained in:
Marc Bonnici 2017-07-26 14:37:05 +01:00
parent ae0847e815
commit b98b74f0be

View File

@ -161,19 +161,19 @@ class EnergyMeasurement(Instrument):
Specify the parameters used to initialize the desired Specify the parameters used to initialize the desired
instrumentation. instrumentation.
"""), """),
Parameter('sites', kind=list_or_string, default=[], Parameter('sites', kind=list_or_string,
description=""" description="""
Specify which sites measurements should be collected Specify which sites measurements should be collected
from, if not specified the measurements will be from, if not specified the measurements will be
collected for all available sites. collected for all available sites.
"""), """),
Parameter('kinds', kind=list_or_string, default=[], Parameter('kinds', kind=list_or_string,
description=""" description="""
Specify the kinds of measurements should be collected, Specify the kinds of measurements should be collected,
if not specified measurements will be if not specified measurements will be
collected for all available kinds. collected for all available kinds.
"""), """),
Parameter('channels', kind=list_or_string, default=[], Parameter('channels', kind=list_or_string,
description=""" description="""
Specify the channels to be collected, Specify the channels to be collected,
if not specified the measurements will be if not specified the measurements will be
@ -204,7 +204,7 @@ class EnergyMeasurement(Instrument):
def initialize(self, context): def initialize(self, context):
self.instrumentation = self.backend.instrument(self.target, **self.params) self.instrumentation = self.backend.instrument(self.target, **self.params)
for channel in self.channels: for channel in self.channels or []:
if not self.instrumentation.get_channels(channel): if not self.instrumentation.get_channels(channel):
raise ConfigError('No channels found for "{}"'.format(channel)) raise ConfigError('No channels found for "{}"'.format(channel))