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] Allow AZ CDL params in nested templates
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_server_parameters.py
diff --git
a/ice_validator/tests/test_server_parameters.py
b/ice_validator/tests/test_server_parameters.py
index
7eb84cb
..
46aa7bf
100644
(file)
--- a/
ice_validator/tests/test_server_parameters.py
+++ b/
ice_validator/tests/test_server_parameters.py
@@
-40,6
+40,7
@@
"""
import pytest
from tests import cached_yaml as yaml
"""
import pytest
from tests import cached_yaml as yaml
+from tests.parametrizers import file_is_a_nested_template
from .helpers import validates
from .helpers import validates
@@
-138,6
+139,8
@@
def check_server_parameter_name(heat_template, parameter, parameter_name):
@validates("R-23311")
def test_availability_zone_parameter_type(yaml_file):
@validates("R-23311")
def test_availability_zone_parameter_type(yaml_file):
+ if file_is_a_nested_template(yaml_file):
+ pytest.skip("Not applicable in nested templates")
check_parameter_type(yaml_file, "availability_zone_", "string")
check_parameter_type(yaml_file, "availability_zone_", "string")
@@
-165,12
+168,6
@@
def test_vf_module_name_parameter_type_and_parameter_name(yaml_file):
check_server_parameter_name(yaml_file, "vf_module_name", "vf_module_name")
check_server_parameter_name(yaml_file, "vf_module_name", "vf_module_name")
-@validates("R-95430")
-def test_vm_role_parameter_type_and_parameter_name(yaml_file):
- check_parameter_type(yaml_file, "vm_role", "string")
- check_server_parameter_name(yaml_file, "vm_role", "vm_role")
-
-
@validates("R-54340")
def test_vf_module_index_parameter_type_and_parameter_name(yaml_file):
check_parameter_type(yaml_file, "vf_module_index", "number")
@validates("R-54340")
def test_vf_module_index_parameter_type_and_parameter_name(yaml_file):
check_parameter_type(yaml_file, "vf_module_index", "number")