[VVP] Add test for R-100260 and fix mapping

[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..b1adce2 100644 (file)
--- a/ice_validator/tests/test_server_parameters.py
+++ b/ice_validator/tests/test_server_parameters.py
@@ -41,7 +41,8 @@
 import pytest
 from tests import cached_yaml as yaml
 
-from .helpers import validates
+from tests.helpers import validates
+from tests.utils.nested_files import file_is_a_nested_template
 
 VERSION = "1.1.0"
 
@@ -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):
+    if file_is_a_nested_template(yaml_file):
+        pytest.skip("Not applicable in nested templates")
     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")
 
 
-@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")