diff options
author | stark, steven <steven.stark@att.com> | 2019-01-28 14:59:01 -0800 |
---|---|---|
committer | stark, steven <steven.stark@att.com> | 2019-01-29 08:03:41 -0800 |
commit | 48a07b6942d3956666d30947372653feb702fdae (patch) | |
tree | 5a5fc3135f2703ad19543b78e661ea954e98bb33 /ice_validator/tests/test_filename_is_vmtype_dot_yaml.py | |
parent | 43130f8b173d9053ad4f56f264376851d3fb890c (diff) |
[VVP] stand alone tool, script updates
1) Validation script updates:
Various bug fixes and script enhancements
New tests for:
R-18683
R-94669
R-304011
R-01455
R-86476
R-708564
R-85734
R-18683
R-94669
R-304011
R-01455
R-86476
R-86476
R-589037
Removed tests for:
R-75202
R-62954
R-22441
R-49177
R-16576
R-86237
R-44491
R-70757
R-01896
R-26124
2) Stand Alone tool introduced
3) Added optional "categories" capability
Change-Id: I193cd5c267750791d97b350e91fc36faa72d8d5f
Issue-ID: VVP-143
Signed-off-by: stark, steven <steven.stark@att.com>
Diffstat (limited to 'ice_validator/tests/test_filename_is_vmtype_dot_yaml.py')
-rw-r--r-- | ice_validator/tests/test_filename_is_vmtype_dot_yaml.py | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/ice_validator/tests/test_filename_is_vmtype_dot_yaml.py b/ice_validator/tests/test_filename_is_vmtype_dot_yaml.py index f31f370..49c917c 100644 --- a/ice_validator/tests/test_filename_is_vmtype_dot_yaml.py +++ b/ice_validator/tests/test_filename_is_vmtype_dot_yaml.py @@ -2,7 +2,7 @@ # ============LICENSE_START==================================================== # org.onap.vvp/validation-scripts # =================================================================== -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright © 2019 AT&T Intellectual Property. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -36,12 +36,10 @@ # ============LICENSE_END============================================ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. - import os -from tests import cached_yaml as yaml - from .helpers import validates -from .utils.vm_types import get_vm_types +from .utils.vm_types import get_all_vm_types +from .parametrizers import get_nested_files VERSION = "1.0.0" @@ -53,23 +51,17 @@ def test_filename_is_vmtype_dot_yaml(yaml_files): vm_types = [] invalid_files = [] + nested_files = [] - for yaml_file in yaml_files: - with open(yaml_file, "r") as f: - yml = yaml.load(f) - - if "resources" not in yml: - continue + nested_files.extend( + os.path.splitext(os.path.basename(filename))[0] + for filename in get_nested_files(yaml_files) + ) - vm_types.extend(get_vm_types(yml["resources"])) + vm_types = get_all_vm_types(yaml_files) - for yaml_file in yaml_files: - basename, filename = os.path.split(yaml_file) - file, ext = os.path.splitext(os.path.basename(filename)) - for vt in vm_types: - if vt == file: - invalid_files.append({"vm_type": vt, "file": yaml_file}) + invalid_files.extend(vm_type for vm_type in vm_types if vm_type in nested_files) - assert not invalid_files, "filenames must not be in format vm_type.yaml: {}".format( - invalid_files - ) + assert ( + not invalid_files + ), "Nested filenames must not be in format vm_type.yaml: {}".format(invalid_files) |