diff options
author | stark, steven <steven.stark@att.com> | 2018-12-17 12:43:02 -0800 |
---|---|---|
committer | stark, steven <steven.stark@att.com> | 2018-12-17 13:04:00 -0800 |
commit | 1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1 (patch) | |
tree | 8092104f8be23051ff81c9f71ee34116df4d33ba /ice_validator/tests/test_volume_templates.py | |
parent | ca9085f0f77d442d3741a8c754e65cc45b6a318d (diff) |
[VVP] updating validation scripts in dublin
- adding backlog of new validation scripts for dublin
- updating existing tests
- removing outdated tests
Issue-ID: VVP-123
Change-Id: Ib8260889ac957c1dd28d8ede450fc8edc6fb0ec0
Signed-off-by: stark, steven <steven.stark@att.com>
Diffstat (limited to 'ice_validator/tests/test_volume_templates.py')
-rw-r--r-- | ice_validator/tests/test_volume_templates.py | 68 |
1 files changed, 52 insertions, 16 deletions
diff --git a/ice_validator/tests/test_volume_templates.py b/ice_validator/tests/test_volume_templates.py index 6d2a44c..bb358d5 100644 --- a/ice_validator/tests/test_volume_templates.py +++ b/ice_validator/tests/test_volume_templates.py @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # org.onap.vvp/validation-scripts # =================================================================== -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. # =================================================================== # # Unless otherwise specified, all software contained herein is licensed @@ -37,16 +37,23 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. # - from tests import cached_yaml as yaml + +from .helpers import validates +from .utils.nested_files import get_list_of_nested_files + +import os import pytest -def test_volume_templates_only_contains_cinder(volume_template): - ''' +@validates("R-270358") +def test_volume_templates_contains_cinder_or_resource_group(volume_template): + """ Check that all templates marked as volume templates are in fact volume templates - ''' + """ + acceptable_resources = [] + with open(volume_template) as fh: yml = yaml.load(fh) @@ -54,14 +61,43 @@ def test_volume_templates_only_contains_cinder(volume_template): if "resources" not in yml: pytest.skip("No resources specified in the heat template") - non_volumes = [] - for k, v in yml["resources"].items(): - if not isinstance(v, dict): - continue - if "type" not in v: - continue - if v["type"] not in ["OS::Cinder::Volume", - "OS::Heat::ResourceGroup"]: - non_volumes.append(k) - - assert not set(non_volumes) + dirname = os.path.dirname(volume_template) + list_of_files = get_list_of_nested_files(yml, dirname) + + list_of_files.append(volume_template) + + for file in list_of_files: + with open(file) as fh: + yml = yaml.load(fh) + + for k, v in yml["resources"].items(): + if not isinstance(v, dict): + continue + if "type" not in v: + continue + if v["type"] in ["OS::Cinder::Volume", "OS::Heat::ResourceGroup"]: + acceptable_resources.append(k) + + assert acceptable_resources, ( + "No OS::Cinder::Volume or OS::Heat::ResourceGroup resources " + "found in volume module" + ) + + +@validates("R-55306") +def test_no_vf_module_index_in_cinder(volume_template): + """ + vf_module_index is prohibited in volume templates + """ + + with open(volume_template) as fh: + yml = yaml.load(fh) + + if "parameters" not in yml: + pytest.skip("No parameters specified in the heat template") + + parameters = yml.get("parameters") + if parameters and isinstance(parameters, dict): + assert ( + "vf_module_index" not in parameters + ), "{} must not use vf_module_index as a parameter".format(volume_template) |