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
Merge "Remove unnecessary check for pytest.skip"
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_volume_templates.py
diff --git
a/ice_validator/tests/test_volume_templates.py
b/ice_validator/tests/test_volume_templates.py
index
bb358d5
..
634da5c
100644
(file)
--- a/
ice_validator/tests/test_volume_templates.py
+++ b/
ice_validator/tests/test_volume_templates.py
@@
-35,7
+35,6
@@
#
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
from tests import cached_yaml as yaml
#
from tests import cached_yaml as yaml
@@
-53,24
+52,16
@@
def test_volume_templates_contains_cinder_or_resource_group(volume_template):
in fact volume templates
"""
acceptable_resources = []
in fact volume templates
"""
acceptable_resources = []
-
- with open(volume_template) as fh:
- yml = yaml.load(fh)
-
- # skip if resources are not defined
- if "resources" not in yml:
- pytest.skip("No resources specified in the heat template")
-
dirname = os.path.dirname(volume_template)
dirname = os.path.dirname(volume_template)
- list_of_files = get_list_of_nested_files(
yml
, dirname)
+ list_of_files = get_list_of_nested_files(
volume_template
, dirname)
list_of_files.append(volume_template)
for file in list_of_files:
with open(file) as fh:
yml = yaml.load(fh)
list_of_files.append(volume_template)
for file in list_of_files:
with open(file) as fh:
yml = yaml.load(fh)
-
- for k, v in
yml["resources"]
.items():
+ resources = yml.get("resources") or {}
+ for k, v in
resources
.items():
if not isinstance(v, dict):
continue
if "type" not in v:
if not isinstance(v, dict):
continue
if "type" not in v: