diff options
author | stark, steven <steven.stark@att.com> | 2019-03-19 18:14:28 -0700 |
---|---|---|
committer | stark, steven <steven.stark@att.com> | 2019-03-21 09:29:59 -0700 |
commit | f257796cdb575d5079dce9738e31808c089f4cf3 (patch) | |
tree | de1de657de07185b5715dd047bf4bfef8d8e2730 /ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py | |
parent | ad5a66886c550eb6cb7c0d46bc097d382397fc87 (diff) |
[VVP] updating OS::Neutron::Port parameter tests
AAP, FIP/IP, FIP/Subnet parameters use same validation (ports.py)
REGEX moved to specific tests
Added tests for R-159016, R-717227, R-805572
Removed mapping for R-98748
Updated env file test to exclude internal AAP params
Change-Id: Iddde8ee42400b8df9be49b8c15718b451101b37b
Issue-ID: VVP-181
Signed-off-by: stark, steven <steven.stark@att.com>
Diffstat (limited to 'ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py')
-rw-r--r-- | ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py | 79 |
1 files changed, 46 insertions, 33 deletions
diff --git a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py index 58351e5..83dd5e3 100644 --- a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py +++ b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py @@ -37,45 +37,58 @@ # # -import pytest -from tests import cached_yaml as yaml +import re from .helpers import validates -from .utils.ports import get_invalid_ip_addresses +from .utils.ports import check_ip_format -@validates( - "R-40971", - "R-27818", - "R-29765", - "R-85235", - "R-78380", - "R-23503", - "R-71577", - "R-04697", - "R-34037", +RE_EXTERNAL_PARAM_FIP = re.compile( # match pattern + r"(?P<vm_type>.+)_(?P<network_role>.+[^(v6)])(_v6)?_ip_(?P<ip_index>.+)$" ) -def test_fixed_ips_include_vm_type_network_role(yaml_file): - """ - Check that all fixed_ips ip addresses include the {vm_type} of the - nova server it is associated to and also contains the {network_role} - of the network it is associated with - """ - with open(yaml_file) as fh: - yml = yaml.load(fh) - # skip if resources are not defined - if "resources" not in yml: - pytest.skip("No resources specified in the heat template") +RE_EXTERNAL_PARAM_FIPS = re.compile( # match pattern + r"(?P<vm_type>.+)_(?P<network_role>.+[^(v6)])(_v6)?_ips$" +) + +RE_INTERNAL_PARAM_FIP = re.compile( # match pattern + r"(?P<vm_type>.+)_int_(?P<network_role>.+[^(v6)])(_v6)?_ip_(?P<ip_index>.+)$" +) + +RE_INTERNAL_PARAM_FIPS = re.compile( # match pattern + r"(?P<vm_type>.+)_int_(?P<network_role>.+[^(v6)])(_v6)?_ips$" +) + +fip_regx_dict = { + "external": { + "string": { + "readable": "{vm-type}_{network-role}_ip_{ip-index} or {vm-type}_{network-role}_v6_ip_{ip-index}", + "machine": RE_EXTERNAL_PARAM_FIP, + }, + "comma_delimited_list": { + "readable": "{vm-type}_{network-role}_ips or {vm-type}_{network-role}_v6_ips", + "machine": RE_EXTERNAL_PARAM_FIPS, + }, + }, + "internal": { + "string": { + "readable": "{vm-type}_int_{network-role}_ip_{ip-index} or {vm-type}_int_{network-role}_v6_ip_{ip-index}", + "machine": RE_INTERNAL_PARAM_FIP, + }, + "comma_delimited_list": { + "readable": "{vm-type}_int_{network-role}_ips or {vm-type}_int_{network-role}_v6_ips", + "machine": RE_INTERNAL_PARAM_FIPS, + }, + }, + "parameter_to_resource_comparisons": ["vm_type", "network_role"], +} + - if "parameters" not in yml: - pytest.skip("No parameters specified in the heat template") +@validates("R-40971", "R-35735", "R-23503", "R-71577", "R-04697", "R-34037") +def test_external_fip_format(yaml_file): + check_ip_format(yaml_file, fip_regx_dict, "external", "fixed_ips", "ip_address") - invalid_ip_addresses = get_invalid_ip_addresses( - yml["resources"], "fixed_ips", yml["parameters"] - ) - msg = "The following fixed_ips are declared incorrectly: {}".format( - ", ".join(invalid_ip_addresses) - ) - assert not set(invalid_ip_addresses), msg +@validates("R-27818", "R-29765", "R-85235", "R-78380", "R-34037") +def test_internal_fip_format(yaml_file): + check_ip_format(yaml_file, fip_regx_dict, "internal", "fixed_ips", "ip_address") |