[VVP] Allow AZ CDL params in nested templates

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

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index bfa9813..9d3062a 100644 (file)
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import pytest
@@ -53,12 +52,12 @@ NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"]
 
 
 @validates("R-62983", "R-86182")
-def test_network_format(heat_template):
+def test_network_format(yaml_file):
     """
     Make sure all network properties use the allowed naming
     conventions
     """
-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
     # skip if resources are not defined
@@ -119,7 +118,7 @@ def test_network_resource_id_format(yaml_file):
 
     assert not set(invalid_networks), (
         "Heat templates must only create internal networks "
-        "and follow format int_{network-role}_network"
+        "and follow format int_{{network-role}}_network"
         "{}".format(", ".join(invalid_networks))
     )