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_resource_ids_alphanumeric_only.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_resource_ids_alphanumeric_only.py')
-rw-r--r-- | ice_validator/tests/test_resource_ids_alphanumeric_only.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ice_validator/tests/test_resource_ids_alphanumeric_only.py b/ice_validator/tests/test_resource_ids_alphanumeric_only.py index d5080f4..f08e0c8 100644 --- a/ice_validator/tests/test_resource_ids_alphanumeric_only.py +++ b/ice_validator/tests/test_resource_ids_alphanumeric_only.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 @@ -46,21 +46,21 @@ from tests import cached_yaml as yaml from .helpers import validates -@validates('R-75141') +@validates("R-75141") def test_alphanumeric_resource_ids_only(yaml_file): - ''' - Check that all instance names are only using alphanumerics - ''' - valid_format = re.compile(r'^[\w-]+$') + valid_format = re.compile(r"^[\w-]+$") with open(yaml_file) as fh: yml = yaml.load(fh) - if 'resources' not in yml: + if "resources" not in yml: pytest.skip("No resources specified in the heat template") - invalid_resource_ids = [k - for k in yml['resources'].keys() - if not valid_format.match(k)] + invalid_resource_ids = [ + k for k in yml["resources"].keys() if not valid_format.match(k) + ] - assert not set(invalid_resource_ids) + msg = "Invalid character(s) detected in the following resource IDs: " + ", ".join( + invalid_resource_ids + ) + assert not set(invalid_resource_ids), msg |