aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Wright <sw3588@att.com>2019-02-18 18:13:14 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-18 18:13:14 +0000
commit55017995e7e5101929c79a5cd1450747d054edce (patch)
treea62d0ec3b59dc575989020d1afbcdf0a8c7e9470
parent3a37d68be925c92c9a540cf589dfbe4c901d7911 (diff)
parent00d850be4e8492c4bfc52e93ff374ad2e827ed94 (diff)
Merge "[VVP] remove tests for 88540, 20947, 54458"
-rw-r--r--ice_validator/tests/test_contrail_instance_ip_resource_id.py16
-rw-r--r--ice_validator/tests/test_contrail_vmi_resource_id.py17
2 files changed, 0 insertions, 33 deletions
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 d08938e..5e80075 100644
--- a/ice_validator/tests/test_contrail_instance_ip_resource_id.py
+++ b/ice_validator/tests/test_contrail_instance_ip_resource_id.py
@@ -120,19 +120,3 @@ def test_contrail_instance_ip_resource_id_internal(yaml_file):
regex_names=("int_ip", "int_v6_ip"),
network_flavor=ContrailV2InstanceIpProcessor.network_flavor_internal,
)
-
-
-@validates("R-20947", "R-88540")
-def test_contrail_instance_ip_resource_id_subint(yaml_file):
- """
- subint
- {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
- _IP_{index}
- {vm-type}_{vm-type_index}_subint_{network-role}_vmi_{vmi_index}
- _v6_IP_{index}
- """
- run_test(
- yaml_file,
- regex_names=("subint_ip", "subint_v6_ip"),
- network_flavor=ContrailV2InstanceIpProcessor.network_flavor_subint,
- )
diff --git a/ice_validator/tests/test_contrail_vmi_resource_id.py b/ice_validator/tests/test_contrail_vmi_resource_id.py
index 4d1efb8..9cabfb4 100644
--- a/ice_validator/tests/test_contrail_vmi_resource_id.py
+++ b/ice_validator/tests/test_contrail_vmi_resource_id.py
@@ -112,20 +112,3 @@ def test_contrail_instance_ip_resource_id_internal(yaml_file):
regex_name="vmi_internal",
network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_internal,
)
-
-
-@validates("R-54458")
-def test_contrail_instance_ip_resource_id_subint(yaml_file):
- """
- 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(
- yaml_file,
- regex_name="vmi_subint",
- network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_subint,
- )