Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] Add test for R-100260 and fix mapping
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_filename_is_vmtype_dot_yaml.py
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
..
2ec4481
100644
(file)
--- 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
# ===================================================================
# ============LICENSE_START====================================================
# org.onap.vvp/validation-scripts
# ===================================================================
-# Copyright © 201
7
AT&T Intellectual Property. All rights reserved.
+# Copyright © 201
9
AT&T Intellectual Property. All rights reserved.
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
@@
-35,13
+35,10
@@
#
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
import os
import os
-from tests import cached_yaml as yaml
-
-from .helpers import validates
-from .utils.vm_types import get_vm_types
+from tests.helpers import validates
+from tests.utils.nested_files import get_nested_files
+from .utils.vm_types import get_all_vm_types
VERSION = "1.0.0"
VERSION = "1.0.0"
@@
-53,23
+50,17
@@
def test_filename_is_vmtype_dot_yaml(yaml_files):
vm_types = []
invalid_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)