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
change if bad to assert not bad, message
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
test_contrail_resource_id.py
diff --git
a/ice_validator/tests/test_contrail_resource_id.py
b/ice_validator/tests/test_contrail_resource_id.py
index
88cc2f0
..
dbbedbb
100644
(file)
--- a/
ice_validator/tests/test_contrail_resource_id.py
+++ b/
ice_validator/tests/test_contrail_resource_id.py
@@
-35,7
+35,6
@@
#
# ============LICENSE_END============================================
#
#
# ============LICENSE_END============================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
"""
#
"""
@@
-89,7
+88,7
@@
def run_test(heat_template, contrail_class, get_parts, part_name):
@validates("R-81214")
@validates("R-81214")
-def test_contrail_interfaceroutetable_resource_id(
heat_templat
e):
+def test_contrail_interfaceroutetable_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::InterfaceRouteTable``
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::InterfaceRouteTable``
@@
-98,7
+97,7
@@
def test_contrail_interfaceroutetable_resource_id(heat_template):
contain the ``{network-role}``.
"""
run_test(
contain the ``{network-role}``.
"""
run_test(
-
heat_templat
e,
+
yaml_fil
e,
ContrailV2InterfaceRouteTableProcessor,
get_network_roles,
"network_role",
ContrailV2InterfaceRouteTableProcessor,
get_network_roles,
"network_role",
@@
-106,7
+105,7
@@
def test_contrail_interfaceroutetable_resource_id(heat_template):
@validates("R-30753")
@validates("R-30753")
-def test_contrail_networkipam_resource_id(
heat_templat
e):
+def test_contrail_networkipam_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::NetworkIpam``
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::NetworkIpam``
@@
-115,12
+114,12
@@
def test_contrail_networkipam_resource_id(heat_template):
contain the ``{network-role}``.
"""
run_test(
contain the ``{network-role}``.
"""
run_test(
-
heat_templat
e, ContrailV2NetworkIpamProcessor, get_network_roles, "network_role"
+
yaml_fil
e, ContrailV2NetworkIpamProcessor, get_network_roles, "network_role"
)
@validates("R-20065")
)
@validates("R-20065")
-def test_contrail_porttuple_resource_id(
heat_templat
e):
+def test_contrail_porttuple_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::PortTuple``
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::PortTuple``
@@
-128,11
+127,11
@@
def test_contrail_porttuple_resource_id(heat_template):
**MUST**
contain the ``{vm-type}``.
"""
**MUST**
contain the ``{vm-type}``.
"""
- run_test(
heat_templat
e, ContrailV2PortTupleProcessor, get_vm_types, "vm_type")
+ run_test(
yaml_fil
e, ContrailV2PortTupleProcessor, get_vm_types, "vm_type")
@validates("R-76014")
@validates("R-76014")
-def test_contrail_servicehealthcheck_resource_id(
heat_templat
e):
+def test_contrail_servicehealthcheck_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::ServiceHealthCheck``
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::ServiceHealthCheck``
@@
-140,13
+139,11
@@
def test_contrail_servicehealthcheck_resource_id(heat_template):
**MUST**
contain the ``{vm-type}``.
"""
**MUST**
contain the ``{vm-type}``.
"""
- run_test(
- heat_template, ContrailV2ServiceHealthCheckProcessor, get_vm_types, "vm_type"
- )
+ run_test(yaml_file, ContrailV2ServiceHealthCheckProcessor, get_vm_types, "vm_type")
@validates("R-16437")
@validates("R-16437")
-def test_contrail_servicetemplate_resource_id(
heat_templat
e):
+def test_contrail_servicetemplate_resource_id(
yaml_fil
e):
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::ServiceTemplate``
"""
A VNF's Heat Orchestration Template's Resource
``OS::ContrailV2::ServiceTemplate``
@@
-154,4
+151,4
@@
def test_contrail_servicetemplate_resource_id(heat_template):
**MUST**
contain the ``{vm-type}``.
"""
**MUST**
contain the ``{vm-type}``.
"""
- run_test(
heat_templat
e, ContrailV2ServiceTemplateProcessor, get_vm_types, "vm_type")
+ run_test(
yaml_fil
e, ContrailV2ServiceTemplateProcessor, get_vm_types, "vm_type")