import re
from .helpers import validates
-from .utils.ports import check_ip_format
+from .utils.ports import check_parameter_format
+from tests.structures import NeutronPortProcessor
RE_EXTERNAL_PARAM_FIP = re.compile( # match pattern
- r"(?P<vm_type>.+)_(?P<network_role>.+[^(v6)])(_v6)?_ip_(?P<ip_index>.+)$"
+ r"(?P<vm_type>.+)_(?P<network_role>.+?)(_v6)?_ip_(?P<ip_index>.+)$"
)
RE_EXTERNAL_PARAM_FIPS = re.compile( # match pattern
- r"(?P<vm_type>.+)_(?P<network_role>.+[^(v6)])(_v6)?_ips$"
+ r"(?P<vm_type>.+)_(?P<network_role>.+?)(_v6)?_ips$"
)
RE_INTERNAL_PARAM_FIP = re.compile( # match pattern
- r"(?P<vm_type>.+)_int_(?P<network_role>.+[^(v6)])(_v6)?_ip_(?P<ip_index>.+)$"
+ r"(?P<vm_type>.+)_int_(?P<network_role>.+?)(_v6)?_ip_(?P<ip_index>.+)$"
)
RE_INTERNAL_PARAM_FIPS = re.compile( # match pattern
- r"(?P<vm_type>.+)_int_(?P<network_role>.+[^(v6)])(_v6)?_ips$"
+ r"(?P<vm_type>.+)_int_(?P<network_role>.+?)(_v6)?_ips$"
)
fip_regx_dict = {
@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")
+ check_parameter_format(yaml_file, fip_regx_dict, "external", NeutronPortProcessor, "fixed_ips", "ip_address")
@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")
+ check_parameter_format(yaml_file, fip_regx_dict, "internal", NeutronPortProcessor, "fixed_ips", "ip_address")