Merge "[VVP] Support pluggable data sources for preload data"

[vvp/validation-scripts.git] / ice_validator / tests / test_non_server_name.py

diff --git a/ice_validator/tests/test_non_server_name.py b/ice_validator/tests/test_non_server_name.py
index f47e078..7a5c11f 100644 (file)
--- a/ice_validator/tests/test_non_server_name.py
+++ b/ice_validator/tests/test_non_server_name.py
@@ -35,20 +35,18 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 """
 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"
 
@@ -66,7 +64,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
@@ -74,13 +72,8 @@ def test_non_server_name(heat_template):
     supplied metadata parameter ``vnf_name`` to generate a unique value.
 
     """
-    h = Heat(filepath=heat_template)
-    if not h.resources:
-        pytest.skip("No resources in this template")
-
+    h = Heat(filepath=yaml_file)
     non_servers = get_non_servers(h)
-    if not non_servers:
-        pytest.skip("No non-server resources in this template")
 
     bad = []
     for rid, resource in non_servers.items():
@@ -149,11 +142,15 @@ 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)