diff options
Diffstat (limited to 'ice_validator/tests/test_subnet_format.py')
| -rw-r--r-- | ice_validator/tests/test_subnet_format.py | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/ice_validator/tests/test_subnet_format.py b/ice_validator/tests/test_subnet_format.py index e5f28cc..51b513c 100644 --- a/ice_validator/tests/test_subnet_format.py +++ b/ice_validator/tests/test_subnet_format.py @@ -2,11 +2,11 @@ # ============LICENSE_START======================================================= # org.onap.vvp/validation-scripts # =================================================================== -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# Copyright © 2018 AT&T Intellectual Property. All rights reserved. # =================================================================== # # 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 # @@ -21,7 +21,7 @@ # # # 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 # @@ -40,26 +40,21 @@ import pytest import yaml -from .utils.network_roles import get_network_role_from_port,\ - property_uses_get_resource +from .utils.network_roles import get_network_role_from_port, property_uses_get_resource import re def test_subnet_format(heat_template): - ''' + """ Make sure all subnet properties follow the allowed naming conventions - ''' + """ formats = [ - ["subnet_id", "string", "internal", - re.compile(r'int_(.+?)_subnet_id')], - ["subnet_id", "string", "internal", - re.compile(r'int_(.+?)_v6_subnet_id')], - ["subnet_id", "string", "external", - re.compile(r'(.+?)_subnet_id')], - ["subnet_id", "string", "external", - re.compile(r'(.+?)_v6_subnet_id')], - ] + ["subnet_id", "string", "internal", re.compile(r"int_(.+?)_subnet_id")], + ["subnet_id", "string", "internal", re.compile(r"int_(.+?)_v6_subnet_id")], + ["subnet_id", "string", "external", re.compile(r"(.+?)_subnet_id")], + ["subnet_id", "string", "external", re.compile(r"(.+?)_v6_subnet_id")], + ] with open(heat_template) as fh: yml = yaml.load(fh) @@ -87,9 +82,9 @@ def test_subnet_format(heat_template): continue # define the network_type - network_type = 'external' - if network_param.startswith('int_'): - network_type = 'internal' + network_type = "external" + if network_param.startswith("int_"): + network_type = "internal" for k2, v2 in v1["properties"].items(): if k2 != "fixed_ips": |