# ============LICENSE_START====================================================
# org.onap.vvp/validation-scripts
# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
#
# ============LICENSE_END============================================
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
-import pytest
-
-from .structures import Heat
-from .structures import ContrailV2VirtualMachineInterface
-from .helpers import validates
"""
resources:
{vm-type}_server_{vm-type_index}
"""
+import pytest
-VERSION = "1.0.0"
+from .structures import Heat
+from .structures import ContrailV2VirtualMachineInterfaceProcessor
+from .helpers import validates
+
+VERSION = "2.0.0"
def run_test(heat_template, regex_name, network_flavor):
"""run test
"""
heat = Heat(filepath=heat_template)
- heat_object_class = ContrailV2VirtualMachineInterface
+ heat_object_class = ContrailV2VirtualMachineInterfaceProcessor
resource_type = heat_object_class.resource_type
resources = heat.get_resource_by_type(resource_type=resource_type)
if not resources:
@validates("R-96253")
-def test_contrail_instance_ip_resource_id_external(heat_template):
+def test_contrail_instance_ip_resource_id_external(yaml_file):
"""
A VNF's Heat Orchestration Template's Resource
OS::ContrailV2::VirtualMachineInterface that is attaching to an
{vm-type}_{vm-type_index}_{network-role}_vmi_{vmi_index}
"""
run_test(
- heat_template,
+ yaml_file,
regex_name="vmi_external",
- network_flavor=ContrailV2VirtualMachineInterface.network_flavor_external,
+ network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_external,
)
@validates("R-50468")
-def test_contrail_instance_ip_resource_id_internal(heat_template):
+def test_contrail_instance_ip_resource_id_internal(yaml_file):
"""
A VNF's Heat Orchestration Template's Resource
OS::ContrailV2::VirtualMachineInterface that is attaching to an
{vm-type}_{vm-type_index}_int_{network-role}_vmi_{vmi_index}
"""
run_test(
- heat_template,
+ yaml_file,
regex_name="vmi_internal",
- network_flavor=ContrailV2VirtualMachineInterface.network_flavor_internal,
- )
-
-
-@validates("R-54458")
-def test_contrail_instance_ip_resource_id_subint(heat_template):
- """
- A VNF's Heat Orchestration Template's Resource
- OS::ContrailV2::VirtualMachineInterface that is attaching to an
- sub-interface network
- Resource ID **MUST** use the naming convention
-
- {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
- """
- run_test(
- heat_template,
- regex_name="vmi_subint",
- network_flavor=ContrailV2VirtualMachineInterface.network_flavor_subint,
+ network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_internal,
)