X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_server_parameters.py;h=b1adce2606058cf2a5bffb609127d67f47fcbc7b;hb=0e2e6cdfb6b659c29ad1a59ac37d3a50191577a0;hp=793051c663d17f0eb9efe0901cdc0ba375bb4320;hpb=8540eb59f7e7f8ff2043a8eaf7edfc255a60874a;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_server_parameters.py b/ice_validator/tests/test_server_parameters.py
index 793051c..b1adce2 100644
--- 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"
 
@@ -137,41 +138,37 @@ def check_server_parameter_name(heat_template, parameter, parameter_name):
 
 
 @validates("R-23311")
-def test_availability_zone_parameter_type(heat_template):
-    check_parameter_type(heat_template, "availability_zone_", "string")
+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")
 
 
 @validates("R-07507")
-def test_vnf_id_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vnf_id", "string")
-    check_server_parameter_name(heat_template, "vnf_id", "vnf_id")
+def test_vnf_id_parameter_type_and_parameter_name(yaml_file):
+    check_parameter_type(yaml_file, "vnf_id", "string")
+    check_server_parameter_name(yaml_file, "vnf_id", "vnf_id")
 
 
 @validates("R-82134")
-def test_vf_module_id_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vf_module_id", "string")
-    check_server_parameter_name(heat_template, "vf_module_id", "vf_module_id")
+def test_vf_module_id_parameter_type_and_parameter_name(yaml_file):
+    check_parameter_type(yaml_file, "vf_module_id", "string")
+    check_server_parameter_name(yaml_file, "vf_module_id", "vf_module_id")
 
 
 @validates("R-62428")
-def test_vnf_name_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vnf_name", "string")
-    check_server_parameter_name(heat_template, "vnf_name", "vnf_name")
+def test_vnf_name_parameter_type_and_parameter_name(yaml_file):
+    check_parameter_type(yaml_file, "vnf_name", "string")
+    check_server_parameter_name(yaml_file, "vnf_name", "vnf_name")
 
 
 @validates("R-39067")
-def test_vf_module_name_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vf_module_name", "string")
-    check_server_parameter_name(heat_template, "vf_module_name", "vf_module_name")
-
-
-@validates("R-95430")
-def test_vm_role_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vm_role", "string")
-    check_server_parameter_name(heat_template, "vm_role", "vm_role")
+def test_vf_module_name_parameter_type_and_parameter_name(yaml_file):
+    check_parameter_type(yaml_file, "vf_module_name", "string")
+    check_server_parameter_name(yaml_file, "vf_module_name", "vf_module_name")
 
 
 @validates("R-54340")
-def test_vf_module_index_parameter_type_and_parameter_name(heat_template):
-    check_parameter_type(heat_template, "vf_module_index", "number")
-    check_server_parameter_name(heat_template, "vf_module_index", "vf_module_index")
+def test_vf_module_index_parameter_type_and_parameter_name(yaml_file):
+    check_parameter_type(yaml_file, "vf_module_index", "number")
+    check_server_parameter_name(yaml_file, "vf_module_index", "vf_module_index")