[VVP] udpating scripts for casablanca 2

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

diff --git a/ice_validator/tests/test_subnet_format.py b/ice_validator/tests/test_subnet_format.py
index e5f28cc..bc183ef 100644 (file)
--- a/ice_validator/tests/test_subnet_format.py
+++ b/ice_validator/tests/test_subnet_format.py
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,12 +38,14 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-import pytest
-import yaml
-from .utils.network_roles import get_network_role_from_port,\
-                                 property_uses_get_resource
 import re
 
+import pytest
+from tests import cached_yaml as yaml
+
+from .utils.network_roles import get_network_role_from_port, \
+    property_uses_get_resource
+
 
 def test_subnet_format(heat_template):
     '''
@@ -58,8 +60,7 @@ def test_subnet_format(heat_template):
               ["subnet_id", "string", "external",
                re.compile(r'(.+?)_subnet_id')],
               ["subnet_id", "string", "external",
-               re.compile(r'(.+?)_v6_subnet_id')],
-              ]
+               re.compile(r'(.+?)_v6_subnet_id')]]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)