diff options
| author |   stark, steven <steven.stark@att.com> | 2019-04-08 12:37:29 -0700 |
|---|---|---|
| committer | stark, steven <steven.stark@att.com> | 2019-04-11 10:26:11 -0700 |
| commit | 96f1a57785ffb99b523bb370a08c93f0ac395393 (patch) | |
| tree | cdbca03ddc2c2495356361631c5763b84fe9f69d | |
| parent | 0e1794537b96149737abf4e6373665eee3579ffe (diff) | |
[VVP] updating v6 regex for fip/ip and fip/subnet
Change-Id: Ia7acc252d6a1429ec0c73f720bb1308dd70178b5
Issue-ID: VVP-188
Signed-off-by: stark, steven <steven.stark@att.com>
| -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 = { |