import pytest
from tests import cached_yaml as yaml
+from tests.utils import nested_files
from .helpers import validates
@validates("R-98450")
-def test_availability_zone_naming(heat_template):
+def test_availability_zone_naming(yaml_file):
"""
Make sure all availability zones are properly formatted
"""
- with open(heat_template) as fh:
+ if nested_files.file_is_a_nested_template(yaml_file):
+ pytest.skip("test does not apply to nested files")
+
+ with open(yaml_file) as fh:
yml = yaml.load(fh)
# skip if resources are not defined
continue
if "get_param" not in v2:
invalid_availability_zones.add(k1)
- elif not re.match(r"availability_zone_\d+", v2["get_param"]):
+ continue
+ if not isinstance(v2["get_param"], str):
+ continue
+ if 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(