X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_non_server_name.py;h=7139c9b78df38119eed001708aa78c195650f3cc;hb=ddba4856fc7e3d844e9e763d44ce97207a1f23bd;hp=f56eef3d8d1a1f286c583a113acfd138f169aed6;hpb=ab01f96b1405bc037853847138a121581bb98f05;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_non_server_name.py b/ice_validator/tests/test_non_server_name.py
index f56eef3..7139c9b 100644
--- a/ice_validator/tests/test_non_server_name.py
+++ b/ice_validator/tests/test_non_server_name.py
@@ -40,14 +40,14 @@
 """
 resource property name
 """
-
+import os
 import collections
-
 import pytest
 
 from .structures import Heat
 from .structures import HeatProcessor
 from .helpers import validates
+from tests.utils import nested_files
 
 VERSION = "1.2.0"
 
@@ -65,7 +65,7 @@ def get_non_servers(heat):
 
 
 @validates("R-85734")
-def test_non_server_name(heat_template):
+def test_non_server_name(yaml_file):
     """
     If a VNF's Heat Orchestration Template contains the property ``name``
     for a non ``OS::Nova::Server`` resource, the intrinsic function
@@ -73,7 +73,7 @@ def test_non_server_name(heat_template):
     supplied metadata parameter ``vnf_name`` to generate a unique value.
 
     """
-    h = Heat(filepath=heat_template)
+    h = Heat(filepath=yaml_file)
     if not h.resources:
         pytest.skip("No resources in this template")
 
@@ -148,11 +148,13 @@ def test_non_server_name(heat_template):
 
 
 @validates("R-85734")
-def test_non_server_name_unique(yaml_files):
+def test_non_server_name_unique(heat_template):
     """Test name has unique value
     """
+    list_nest = nested_files.get_list_of_nested_files(heat_template, os.path.dirname(heat_template))
+    list_nest.append(heat_template)
     non_servers = {}
-    for yaml_file in yaml_files:
+    for yaml_file in list_nest:
         h = Heat(filepath=yaml_file)
         non_servers.update(get_non_servers(h))
     names = collections.defaultdict(set)