Skip to content

Commit

Permalink
check_feature_template: remove support for legacy HW feature path
Browse files Browse the repository at this point in the history
Change-Id: Ida56e61fae9840d45afe17ee0ca4b99856fb6d08
  • Loading branch information
jouvin committed Jul 14, 2018
1 parent 29d63ae commit 1d3c0ab
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions lib/aquilon/worker/dbwrappers/feature.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,11 @@ def check_feature_template(config, dbarchetype, dbfeature, dbdomain):

# The broker has no control over the extension used, so we check for
# everything panc accepts
for ext in ('pan', 'tpl'):
for feature_dir in feature_template_dirs:
for feature_dir in feature_template_dirs:
for ext in ('pan', 'tpl'):
if os.path.exists("{}/config.{}" .format(feature_dir, ext)):
return

# Legacy path for hardware features
if os.path.exists("%s/%s/%s.%s" % (basedir, dbarchetype.name,
dbfeature.cfg_path, ext)):
return

raise ArgumentError("{0} does not have templates present in {1:l} "
"for {2:l}.".format(dbfeature, dbdomain, dbarchetype))

Expand Down

0 comments on commit 1d3c0ab

Please sign in to comment.