Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] updating v6 regex for fip/ip and fip/subnet
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_fixed_ips_include_vm_type_network_role.py
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
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
)
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
)
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
)
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 = {
)
fip_regx_dict = {