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 = {
VERSION = "1.3.0"
RE_EXTERNAL_PARAM_SUBNET = re.compile( # match pattern
- r"(?P<network_role>.+[^(v6)])(_v6)?_subnet_id$"
+ r"(?P<network_role>.+?)(_v6)?_subnet_id$"
)
RE_INTERNAL_PARAM_SUBNET = re.compile( # match pattern
- r"int_(?P<network_role>.+[^(v6)])(_v6)?_subnet_id$"
+ r"int_(?P<network_role>.+?)(_v6)?_subnet_id$"
)
fip_regx_dict = {