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
Aligned test with updated R-610030
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_contrail_instance_ip_resource_id.py
diff --git
a/ice_validator/tests/test_contrail_instance_ip_resource_id.py
b/ice_validator/tests/test_contrail_instance_ip_resource_id.py
index
5e80075
..
2833d5b
100644
(file)
--- a/
ice_validator/tests/test_contrail_instance_ip_resource_id.py
+++ b/
ice_validator/tests/test_contrail_instance_ip_resource_id.py
@@
-36,10
+36,6
@@
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
#
-"""
-resources:
-{vm-type}_server_{vm-type_index}
-"""
import pytest
from .structures import Heat
import pytest
from .structures import Heat
@@
-64,8
+60,9
@@
def run_test(heat_template, regex_names, network_flavor):
flavor = processor.get_network_flavor(resource)
if flavor != network_flavor:
continue
flavor = processor.get_network_flavor(resource)
if flavor != network_flavor:
continue
+
regex_name = processor.get_rid_match_tuple(rid)[0]
regex_name = processor.get_rid_match_tuple(rid)[0]
- if regex_name in regex_names:
+ if regex_name
and regex_name
in regex_names:
continue
bad.append(rid)
assert not bad, "%s resource ids %s must match one of %s" % (
continue
bad.append(rid)
assert not bad, "%s resource ids %s must match one of %s" % (
@@
-101,7
+98,7
@@
def test_contrail_instance_ip_resource_id_external(yaml_file):
run_test(
yaml_file,
run_test(
yaml_file,
- regex_names=("
ip", "v6_ip
"),
+ regex_names=("
external
"),
network_flavor=ContrailV2InstanceIpProcessor.network_flavor_external,
)
network_flavor=ContrailV2InstanceIpProcessor.network_flavor_external,
)
@@
-117,6
+114,6
@@
def test_contrail_instance_ip_resource_id_internal(yaml_file):
"""
run_test(
yaml_file,
"""
run_test(
yaml_file,
- regex_names=("int
_ip", "int_v6_ip
"),
+ regex_names=("int
ernal
"),
network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal,
)
network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal,
)