Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] updating validation scripts in dublin
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_resource_ids_alphanumeric_only.py
diff --git
a/ice_validator/tests/test_resource_ids_alphanumeric_only.py
b/ice_validator/tests/test_resource_ids_alphanumeric_only.py
index
dc508ba
..
f08e0c8
100644
(file)
--- a/
ice_validator/tests/test_resource_ids_alphanumeric_only.py
+++ b/
ice_validator/tests/test_resource_ids_alphanumeric_only.py
@@
-6,7
+6,7
@@
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the
“License”
);
+# under the Apache License, Version 2.0 (the
"License"
);
# you may not use this software except in compliance with the License.
# You may obtain a copy of the License at
#
# you may not use this software except in compliance with the License.
# You may obtain a copy of the License at
#
@@
-21,7
+21,7
@@
#
#
# Unless otherwise specified, all documentation contained herein is licensed
#
#
# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the
“License”
);
+# under the Creative Commons License, Attribution 4.0 Intl. (the
"License"
);
# you may not use this documentation except in compliance with the License.
# You may obtain a copy of the License at
#
# you may not use this documentation except in compliance with the License.
# You may obtain a copy of the License at
#
@@
-38,25
+38,29
@@
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
-import yaml
-import pytest
import re
import re
+import pytest
+from tests import cached_yaml as yaml
+
+from .helpers import validates
+
+@validates("R-75141")
def test_alphanumeric_resource_ids_only(yaml_file):
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)
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")
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