X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fyaml-validate.py;h=c93c84bc0e7addc88b163c230361e87cc9414196;hb=46e7d8110fc3a09d8e6b8c30e1dd1f45519f2c8f;hp=cb5669a75de8fce7921887cfefc55434278c9069;hpb=6d0cec55ce50a54ede405c465f26fe87bb68af4e;p=apex-tripleo-heat-templates.git

diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index cb5669a7..c93c84bc 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -16,26 +16,81 @@ import sys
 import traceback
 import yaml
 
-base_path = sys.argv[1]
-exit_val = 0
-failed_files = []
+
+def exit_usage():
+    print('Usage %s <yaml file or directory>' % sys.argv[0])
+    sys.exit(1)
+
+
+def validate_service(filename, tpl):
+    if 'outputs' in tpl and 'role_data' in tpl['outputs']:
+        if 'value' not in tpl['outputs']['role_data']:
+            print('ERROR: invalid role_data for filename: %s'
+                  % filename)
+            return 1
+        role_data = tpl['outputs']['role_data']['value']
+        if 'service_name' not in role_data:
+            print('ERROR: service_name is required in role_data for %s.'
+                  % filename)
+            return 1
+        # service_name must match the filename, but with an underscore
+        if (role_data['service_name'] !=
+                os.path.basename(filename).split('.')[0].replace("-", "_")):
+            print('ERROR: service_name should match file name for service: %s.'
+                  % filename)
+            return 1
+    return 0
+
 
 def validate(filename):
+    print('Validating %s' % filename)
+    retval = 0
     try:
-        yaml.load(open(filename).read())
+        tpl = yaml.load(open(filename).read())
+
+        if (filename.startswith('./puppet/services/') and
+                filename != './puppet/services/services.yaml'):
+            retval = validate_service(filename, tpl)
+
     except Exception:
         print(traceback.format_exc())
         return 1
-    return 0
+    # yaml is OK, now walk the parameters and output a warning for unused ones
+    for p in tpl.get('parameters', {}):
+        str_p = '\'%s\'' % p
+        in_resources = str_p in str(tpl.get('resources', {}))
+        in_outputs = str_p in str(tpl.get('outputs', {}))
+        if not in_resources and not in_outputs:
+            print('Warning: parameter %s in template %s appears to be unused'
+                  % (p, filename))
+
+    return retval
+
+if len(sys.argv) < 2:
+    exit_usage()
+
+path_args = sys.argv[1:]
+exit_val = 0
+failed_files = []
 
-for subdir, dirs, files in os.walk(base_path):
-    for f in files:
-        if f.endswith('.yaml'):
-            file_path = os.path.join(subdir, f)
-            failed = validate(file_path)
-            if failed:
-                failed_files.append(file_path)
-            exit_val |= failed
+for base_path in path_args:
+    if os.path.isdir(base_path):
+        for subdir, dirs, files in os.walk(base_path):
+            for f in files:
+                if f.endswith('.yaml'):
+                    file_path = os.path.join(subdir, f)
+                    failed = validate(file_path)
+                    if failed:
+                        failed_files.append(file_path)
+                    exit_val |= failed
+    elif os.path.isfile(base_path) and base_path.endswith('.yaml'):
+        failed = validate(base_path)
+        if failed:
+            failed_files.append(base_path)
+        exit_val |= failed
+    else:
+        print('Unexpected argument %s' % base_path)
+        exit_usage()
 
 if failed_files:
     print('Validation failed on:')