[VVP] updating validation scripts in dublin

- adding backlog of new validation scripts for dublin
- updating existing tests
- removing outdated tests

Issue-ID: VVP-123
Change-Id: Ib8260889ac957c1dd28d8ede450fc8edc6fb0ec0
Signed-off-by: stark, steven <steven.stark@att.com>

1 files changed, 44 insertions, 43 deletions

diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index 32b448e..fabe9bd 100644
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -44,89 +44,90 @@
 from tests import cached_yaml as yaml
 from .helpers import validates
 
-VERSION = '1.2.0'
+VERSION = "1.2.0"
 
 # pylint: disable=invalid-name
 
 
-@validates('R-27078')
+@validates("R-27078")
 def test_heat_template_structure_contains_heat_template_version(yaml_file):
-    '''
+    """
     Check that all heat templates have the required sections
-    '''
+    """
     required_key_values = ["heat_template_version"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    assert all([k in yml for k in required_key_values]), (
-        "{} doesn't contain the {} section, but it is required"
-        .format(yaml_file, required_key_values[0]))
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
 
 
-@validates('R-39402')
+@validates("R-39402")
 def test_heat_template_structure_contains_description(yaml_file):
-    '''
+    """
     Check that all heat templates have the required sections
-    '''
+    """
     required_key_values = ["description"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    assert all([k in yml for k in required_key_values]), (
-        "{} doesn't contain the {} section, but it is required"
-        .format(yaml_file, required_key_values[0]))
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
 
 
-@validates('R-35414')
+@validates("R-35414")
 def test_heat_template_structure_contains_parameters(yaml_file):
-    '''
+    """
     Check that all heat templates have the required sections
-    '''
+    """
     required_key_values = ["parameters"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    assert all([k in yml for k in required_key_values]), (
-        "{} doesn't contain the {} section, but it is required"
-        .format(yaml_file, required_key_values[0]))
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        yaml_file, required_key_values[0]
+    )
 
 
-@validates('R-23664')
+@validates("R-23664")
 def test_heat_template_structure_contains_resources(heat_template):
-    '''
+    """
     Check that all heat templates have the required sections
-    '''
+    """
     required_key_values = ["resources"]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
-    assert all([k in yml for k in required_key_values]), (
-        "{} doesn't contain the {} section, but it is required"
-        .format(heat_template, required_key_values[0]))
+    assert all(
+        [k in yml for k in required_key_values]
+    ), "{} doesn't contain the {} section, but it is required".format(
+        heat_template, required_key_values[0]
+    )
 
 
-@validates('R-11441')
+@validates("R-11441")
 def test_parameter_type(yaml_file):
-    '''A VNF's Heat Orchestration Template's parameter type **MUST**
+    """A VNF's Heat Orchestration Template's parameter type **MUST**
     be one of the following values:
-    '''
-    types = ['string',
-             'number',
-             'json',
-             'comma_delimited_list',
-             'boolean']
+    """
+    types = ["string", "number", "json", "comma_delimited_list", "boolean"]
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
-    for key, param in yml.get('parameters', {}).items():
-        assert isinstance(param, dict), '%s parameter %s is not dict' % (
-            yaml_file,
-            key)
-        assert 'type' in param, '%s parameter %s has no "type"' % (
-            yaml_file,
-            key)
-        typ = param['type']
+    for key, param in yml.get("parameters", {}).items():
+        assert isinstance(param, dict), "%s parameter %s is not dict" % (yaml_file, key)
+        if "type" not in param:
+            continue
+        typ = param["type"]
         assert typ in types, '%s parameter %s has invalid type "%s"' % (
             yaml_file,
             key,
-            typ)
-
+            typ,
+        )