X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_environment_file_structure.py;h=3b8763bb9a57ce6d4eaaa50dae34d6d2bbf1b69c;hb=00c64458942602efe5a3b712540b98ac94fb60f4;hp=34d3b4884319cb34f617fc133ee99263a5a2fd21;hpb=f5edc06be0d8bedeb0904b348ba5e3e67c74f186;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_environment_file_structure.py b/ice_validator/tests/test_environment_file_structure.py
index 34d3b48..3b8763b 100644
--- a/ice_validator/tests/test_environment_file_structure.py
+++ b/ice_validator/tests/test_environment_file_structure.py
@@ -35,14 +35,12 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 """ environment file structure
 """
 
-import yaml
-import pytest
+from tests import cached_yaml as yaml
 
 from .helpers import validates
 
@@ -51,25 +49,6 @@ VERSION = "1.0.0"
 # pylint: disable=invalid-name
 
 
-def test_environment_structure(env_file):
-    """
-    Check that all environments files only have the allowed sections
-    """
-    key_values = [
-        "parameters",
-        "event_sinks",
-        "encrypted_parameters",
-        "parameter_merge_strategies",
-    ]
-
-    with open(env_file) as fh:
-        yml = yaml.load(fh)
-    assert [k for k in key_values if k in yml], "%s missing any of %s" % (
-        env_file,
-        key_values,
-    )
-
-
 @validates("R-03324")
 def test_environment_file_contains_required_sections(env_file):
     """
@@ -81,29 +60,3 @@ def test_environment_file_contains_required_sections(env_file):
         yml = yaml.load(fh)
     missing_keys = [v for v in required_keys if v not in yml]
     assert not missing_keys, "%s missing %s" % (env_file, missing_keys)
-
-
-def test_environment_file_sections_have_the_right_format(env_file):
-    """
-    Check that all environment files have sections of the right format.
-    Do note that it only tests for dicts or not dicts currently.
-    """
-    dict_keys = ["parameters", "encrypted_parameters", "parameter_merge_strategies"]
-    not_dict_keys = ["event_sinks"]
-
-    with open(env_file) as fh:
-        yml = yaml.load(fh)
-
-    if not [k for k in dict_keys + not_dict_keys if k in yml]:
-        pytest.skip("The fixture is not applicable for this test")
-
-    bad_dict_keys = [k for k in dict_keys if k in yml and not isinstance(yml[k], dict)]
-    bad_not_dict_keys = [
-        k for k in not_dict_keys if k in yml and isinstance(yml[k], dict)
-    ]
-    errors = []
-    if bad_dict_keys:
-        errors.append("must be dict %s" % bad_dict_keys)
-    if bad_not_dict_keys:
-        errors.append("must not be dict %s" % bad_not_dict_keys)
-    assert not errors, "%s errors:\n    %s" % (env_file, "\n    ".join(errors))