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_nova_server_resource_id.py
diff --git
a/ice_validator/tests/test_nova_server_resource_id.py
b/ice_validator/tests/test_nova_server_resource_id.py
index
be38af5
..
d8d9754
100644
(file)
--- a/
ice_validator/tests/test_nova_server_resource_id.py
+++ b/
ice_validator/tests/test_nova_server_resource_id.py
@@
-51,7
+51,7
@@
VERSION = "2.0.0"
@validates("R-29751")
@validates("R-29751")
-def test_nova_server_resource_id(
heat_templat
e):
+def test_nova_server_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
OS::Nova::Server Resource ID
"""
A VNF's Heat Orchestration Template's Resource
OS::Nova::Server Resource ID
@@
-60,7
+60,7
@@
def test_nova_server_resource_id(heat_template):
* ``{vm-type}_server_{index}``
"""
* ``{vm-type}_server_{index}``
"""
- heat = Heat(filepath=
heat_templat
e)
+ heat = Heat(filepath=
yaml_fil
e)
resources = heat.nova_server_resources
if not resources:
pytest.skip("No Nova Server resources found")
resources = heat.nova_server_resources
if not resources:
pytest.skip("No Nova Server resources found")