diff options
| author |   Steven Wright <sw3588@att.com> | 2019-04-12 16:37:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-12 16:37:20 +0000 |
| commit | d0cb7757c638cbc60b80c4b645cfb7319ee2ba81 (patch) | |
| tree | ddfcca48ce2f4bfd8ac3a9181e481a1ba36a5809 /ice_validator/tests | |
| parent | 005ca442b4818d5cf5eb53490105704674f5b145 (diff) | |
| parent | 96f1a57785ffb99b523bb370a08c93f0ac395393 (diff) | |
Merge "[VVP] updating v6 regex for fip/ip and fip/subnet"
Diffstat (limited to 'ice_validator/tests')
| -rw-r--r-- | ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py | 8 | ||||
| -rw-r--r-- | ice_validator/tests/test_neutron_port_fixed_ips_subnet.py | 4 |
2 files changed, 6 insertions, 6 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 83dd5e3..4c62528 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 @@ -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 --- 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 = { |