Merge "[VVP] updating v6 regex for fip/ip and fip/subnet"

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 83dd5e3..4c62528 100644 (file)
--- 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
@@ -44,19 +44,19 @@ from .utils.ports import check_ip_format
 
 
 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 = {

diff --git a/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py b/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
index 857fbff..1df7aac 100644 (file)
--- a/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
+++ b/ice_validator/tests/test_neutron_port_fixed_ips_subnet.py
@@ -73,11 +73,11 @@ from .utils.ports import check_ip_format
 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 = {