[VVP] revert nested resource section

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

diff --git a/ice_validator/tests/test_volume_resource_ids.py b/ice_validator/tests/test_volume_resource_ids.py
index 45b05e7..c6af6a7 100644 (file)
--- a/ice_validator/tests/test_volume_resource_ids.py
+++ b/ice_validator/tests/test_volume_resource_ids.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,22 +35,20 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-
 import re
 import pytest
-import yaml
+from tests import cached_yaml as yaml
 from .utils.vm_types import get_vm_type_for_nova_server
 
 
-def test_volume_resource_ids(heat_template):
+def test_volume_resource_ids(yaml_file):
     """
     Check that all resource ids for cinder volumes follow the right
     naming convention to include the {vm_type} of the
     nova server it is associated to
     """
-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
     # skip if resources are not defined
@@ -164,4 +162,7 @@ def test_volume_resource_ids(heat_template):
                 else:
                     continue
 
-    assert not set(invalid_volumes)
+    msg = "The following volumes have invalid resource IDs: {}".format(
+        ", ".join(invalid_volumes)
+    )
+    assert not set(invalid_volumes), msg