X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_base_template_names.py;h=dbc881592800c2a03c8d7048c4dc7a3d8afdbf1c;hp=27be5fc97b6351637ce261209f1922f9bce4da2a;hb=60d5ad7d00eadd6395eca186e6fa76a43df3c6cf;hpb=c42086a36bbfaf9286e1c08330f25d1b06a35f4b

diff --git a/ice_validator/tests/test_base_template_names.py b/ice_validator/tests/test_base_template_names.py
index 27be5fc..dbc8815 100644
--- a/ice_validator/tests/test_base_template_names.py
+++ b/ice_validator/tests/test_base_template_names.py
@@ -1,12 +1,12 @@
 # -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
+# ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,11 +38,21 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
+"""base template names
+"""
+
 from os import listdir
 from os import path
+import re
+
 from .helpers import check_basename_ending
 from .helpers import validates
 
+VERSION = '1.2.0'
+
+# is 'base', starts with 'base_', contains '_base_', ends with '_base'
+RE_BASE = re.compile(r'(^base$)|(^base_)|(_base_)|(_base$)')
+
 
 @validates('R-37028', 'R-87485', 'R-81339', 'R-87247', 'R-76057')
 def test_base_template_names(template_dir):
@@ -60,9 +70,10 @@ def test_base_template_names(template_dir):
         if check_basename_ending('volume', filename):
             continue
 
-        if (filename.endswith("_base") or
-                filename.startswith("base_") or
-                filename == "base" or
-                filename.find("_base_") > 0):
+        if RE_BASE.search(filename.lower()):
             base_template_count += 1
-    assert base_template_count == 1
+    assert base_template_count == 1, (
+        'must be 1 "*_base_*" in %s not %d' % (
+            filenames,
+            base_template_count))
+