sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2024-10-06 19:01:15 +01:00
Code Issues Releases Wiki Activity

ConfigParser: Added ID validation - IDs cannot contain a - because its used to separate section IDs from workload IDs - global is a reserved ID for the "global" section.

Browse Source
This commit is contained in:
Sebastian Goscik 2016-08-12 13:13:59 +01:00
parent 451d973a65
commit 6798a54a61
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wlauto/core/configuration/parsers.py
View File

@ -210,6 +210,10 @@ class AgendaParser(object):
continue continue
if entry_id in seen_section_ids: if entry_id in seen_section_ids:
raise ConfigError('Duplicate section ID "{}".'.format(entry_id)) raise ConfigError('Duplicate section ID "{}".'.format(entry_id))
# "-" is reserved for joining section and workload IDs
if "-" in entry_id:
msg = 'Invalid ID "{}"; IDs cannot contain a "-"'
raise ConfigError(msg.format(entry_id))
seen_section_ids.add(entry_id) seen_section_ids.add(entry_id)
seen_workload_ids = set() seen_workload_ids = set()
@ -219,6 +223,12 @@ class AgendaParser(object):
continue continue
if entry_id in seen_workload_ids: if entry_id in seen_workload_ids:
raise ConfigError('Duplicate workload ID "{}".'.format(entry_id)) raise ConfigError('Duplicate workload ID "{}".'.format(entry_id))
# "-" is reserved for joining section and workload IDs
if "-" in entry_id:
msg = 'Invalid ID "{}"; IDs cannot contain a "-"'
raise ConfigError(msg.format(entry_id))
if entry_id == "global":
raise ConfigError(('The ID "global" is reserved'))
seen_workload_ids.add(entry_id) seen_workload_ids.add(entry_id)
# PHASE 4: Assigning IDs and validating entries # PHASE 4: Assigning IDs and validating entries