Merge "Refactor of linting/config validation"

ci-scripts/linters/lint-browbeat-config.py

@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-import yaml
-import sys
-from pykwalify import core as pykwalify_core
-from pykwalify import errors as pykwalify_errors
-stream = open(sys.argv[1], 'r')
-schema = yaml.safe_load(stream)
-check = pykwalify_core.Core(sys.argv[2], schema_data=schema)
-try:
-    check.validate(raise_exception=True)
-    print ("Validation successful")
-    exit(0)
-except pykwalify_errors.SchemaError as e:
-    print ("Config " + sys.argv[2] + " is not valid!")
-    raise Exception('File does not conform to schema: {}'.format(e))

conf/browbeat-workloads.yml

@@ -3,7 +3,6 @@ browbeat:
   results: results/
   rerun: 1
   cloud_name: openstack
-  overcloud_credentials: /home/stack/overcloudrc
 elasticsearch:
   enabled: false
   regather: false

tox.ini

@@ -17,10 +17,10 @@ commands =
   bash -c "cd ansible; find . -type f -regex '.*.y[a]?ml' -print0 | xargs -t -n1 -0 \
     ansible-lint \
     -x ANSIBLE0013,ANSIBLE0012,ANSIBLE0006,ANSIBLE0007,ANSIBLE0010,ANSIBLE0016"
-  python ci-scripts/linters/lint-browbeat-config.py browbeat/validate.yaml browbeat-config.yaml
-  python ci-scripts/linters/lint-browbeat-config.py browbeat/validate.yaml browbeat-complete.yaml
-  bash -c "for config in $(ls conf/); do \
-    python ci-scripts/linters/lint-browbeat-config.py browbeat/validate.yaml conf/$config; done"
+  pykwalify -d browbeat-config.yaml -s browbeat/validate.yaml
+  pykwalify -d browbeat-complete.yaml -s browbeat/validate.yaml
+  bash -c "set -e; for config in $(ls conf/); do \
+    pykwalify -d conf/$config -s browbeat/validate.yaml; done"
 
 [testenv:pep8]
 commands = flake8 {posargs}