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
Aligned test with updated R-610030
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_incremental_module.py
diff --git
a/ice_validator/tests/test_incremental_module.py
b/ice_validator/tests/test_incremental_module.py
index
606dfe4
..
47c7901
100644
(file)
--- a/
ice_validator/tests/test_incremental_module.py
+++ b/
ice_validator/tests/test_incremental_module.py
@@
-50,10
+50,14
@@
def test_incremental_module_has_server(yaml_files):
servers = Heat(filepath=module).get_resource_by_type(
"OS::Nova::Server", all_resources=True
)
servers = Heat(filepath=module).get_resource_by_type(
"OS::Nova::Server", all_resources=True
)
- if not servers:
+ volumes = Heat(filepath=module).get_resource_by_type(
+ "OS::Cinder::Volume", all_resources=True
+ )
+ if not (servers or volumes):
errors.append(os.path.basename(module))
assert not errors, (
errors.append(os.path.basename(module))
assert not errors, (
- "The following incremental modules do not contain an OS::Nova::Server "
+ "The following incremental modules do not contain at least one "
+ "OS::Nova::Server or OS::Cinder::Volume "
"as required: {}".format(", ".join(errors))
)
"as required: {}".format(", ".join(errors))
)