commit f3aebda7eace119444c88df52fb8d6c3e9f4323b
author Ole Troan <ot@cisco.com> Fri Jan 03 16:37:27 2020 +0100
committer Paul Vinciguerra <pvinci@vinciconsulting.com> Sat Jan 04 16:14:04 2020 +0000
tree d26b359b225681ff3f37a685e7635f727bb5ce8e
parent 69c2a5895a7233076fdf4328a80bd0777931d159

misc: fix feature.yaml

Add checkfeaturelist validation to checkstyle.
Fix two files with errors.

Type: docs
Change-Id: I81eda0e25b271f2006b4da22efdf7218d52a67d3
Signed-off-by: Ole Troan <ot@cisco.com>

src/scripts/fts.py

diff --git a/src/scripts/fts.py b/src/scripts/fts.py
index f3165ce..750b73f 100755
--- a/src/scripts/fts.py
+++ b/src/scripts/fts.py
@@ -6,7 +6,7 @@
 import yaml
 from pprint import pprint
 import re
-from jsonschema import validate
+from jsonschema import validate, exceptions
 import argparse
 from subprocess import run, PIPE
 
@@ -96,10 +96,11 @@
         print('# {}'.format(v['name']))
         if type(v['maintainer']) is list:
             print('Maintainers: ' +
-                  ', '.join('{}'.format(m) for m in v['maintainer']))
+                  ', '.join('{}'.format(m) for m in
+                            v['maintainer']) + '  ')
         else:
             print('Maintainer: {}  '.format(v['maintainer']))
-        print('State: {}\n'.format(v['state']))
+        print('State: {}  \n'.format(v['state']))
         print('{}\n'.format(v['description']))
         output_features(0, v['features'])
         if 'missing' in v:
@@ -137,7 +138,12 @@
         # Load configuration file
         with open(featurefile) as f:
             cfg = yaml.load(f, Loader=yaml.SafeLoader)
-        validate(instance=cfg, schema=schema)
+        try:
+            validate(instance=cfg, schema=schema)
+        except exceptions.ValidationError:
+            print('File does not validate: {}'.format(featurefile),
+                  file=sys.stderr)
+            raise
         features[featurefile] = cfg
 
     if args.markdown: