[VVP] udpating scripts for casablanca 2

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

diff --git a/ice_validator/tests/test_availability_zone.py b/ice_validator/tests/test_availability_zone.py
index 6e0de32..33d07e1 100644 (file)
--- a/ice_validator/tests/test_availability_zone.py
+++ b/ice_validator/tests/test_availability_zone.py
@@ -43,7 +43,7 @@
 import re
 
 import pytest
-import yaml
+from tests import cached_yaml as yaml
 
 from .helpers import validates
 
@@ -65,7 +65,7 @@ def test_availability_zone_naming(heat_template):
 
     invalid_availability_zones = set()
 
-    for v1 in yml["resources"].values():
+    for k1, v1 in yml["resources"].items():
         if not isinstance(v1, dict):
             continue
         if "properties" not in v1:
@@ -79,9 +79,12 @@ def test_availability_zone_naming(heat_template):
                     continue
                 if 'str_replace' in v2:
                     continue
-                if not re.match(r'availability_zone_\d+', v2["get_param"]):
+                if "get_param" not in v2:
+                    invalid_availability_zones.add(k1)
+                elif not re.match(r'availability_zone_\d+', v2["get_param"]):
                     invalid_availability_zones.add(v2["get_param"])
 
     assert not invalid_availability_zones, (
-            'invalid availability zones %s' % list(
-                    invalid_availability_zones))
+        'invalid availability zones %s' % list(
+            invalid_availability_zones))
+