diff options
author | stark, steven <ss820f@att.com> | 2018-09-14 07:55:49 -0700 |
---|---|---|
committer | stark, steven <ss820f@att.com> | 2018-09-14 07:55:49 -0700 |
commit | 60d5ad7d00eadd6395eca186e6fa76a43df3c6cf (patch) | |
tree | 95d83d0a70a948707ead37800bc547da7f5861b2 /ice_validator/tests/test_availability_zone.py | |
parent | 31d5da59b39d38760cc519a2c5e5b70357b539e8 (diff) |
[VVP] udpating scripts for casablanca 2
adding scripts updates
adding docrators for sections 5.2.6 - end
closes out VVP 80
Change-Id: Iecac476949aa3ae3982f8c77671869583eb313d6
Issue-ID: VVP-80
Signed-off-by: stark, steven <ss820f@att.com>
Diffstat (limited to 'ice_validator/tests/test_availability_zone.py')
-rw-r--r-- | ice_validator/tests/test_availability_zone.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/ice_validator/tests/test_availability_zone.py b/ice_validator/tests/test_availability_zone.py index 4f250b8..33d07e1 100644 --- a/ice_validator/tests/test_availability_zone.py +++ b/ice_validator/tests/test_availability_zone.py @@ -43,18 +43,18 @@ import re import pytest -import yaml +from tests import cached_yaml as yaml from .helpers import validates -VERSION = "1.1.0" +VERSION = '1.1.0' -@validates("R-98450") +@validates('R-98450') def test_availability_zone_naming(heat_template): - """ + ''' Make sure all availability zones are properly formatted - """ + ''' with open(heat_template) as fh: yml = yaml.load(fh) @@ -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: @@ -75,13 +75,16 @@ def test_availability_zone_naming(heat_template): if v1["type"] == "OS::Nova::Server": for k2, v2 in v1["properties"].items(): - if k2 != "availability_zone": + if k2 != 'availability_zone': continue - if "str_replace" in v2: + 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 - ) + assert not invalid_availability_zones, ( + 'invalid availability zones %s' % list( + invalid_availability_zones)) + |