X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ice_validator%2Ftests%2Ftest_network_format.py;h=f146f75f4952a6393d885745d75d9ffaca94a1b1;hb=5f9c956c157b106014e7b5104a799c4fb818dba1;hp=bfa9813c96ee0c2cca3bd1b63e3171df5e00b28b;hpb=1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index bfa9813..f146f75 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import pytest
@@ -44,7 +43,7 @@ import re
 from tests import cached_yaml as yaml
 
 from .helpers import validates
-from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
+from .utils.network_roles import property_uses_get_resource
 
 RE_INTERNAL_NETWORK_RID = re.compile(  # match pattern
     r"int_(?P<network_role>.+)_network$"
@@ -52,40 +51,6 @@ RE_INTERNAL_NETWORK_RID = re.compile(  # match pattern
 NETWORK_RESOURCE_TYPES = ["OS::Neutron::Net", "OS::ContrailV2::VirtualNetwork"]
 
 
-@validates("R-62983", "R-86182")
-def test_network_format(heat_template):
-    """
-    Make sure all network properties use the allowed naming
-    conventions
-    """
-    with open(heat_template) as fh:
-        yml = yaml.load(fh)
-
-    # skip if resources are not defined
-    if "resources" not in yml:
-        pytest.skip("No resources specified in the heat template")
-
-    invalid_ports = []
-    for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if property_uses_get_resource(v, "network"):
-            continue
-        if v.get("type") != "OS::Neutron::Port":
-            continue
-        if not get_network_role_from_port(v):
-            invalid_ports.append(k)
-
-    assert not set(invalid_ports), (
-        "Missing 'network' property or improperly "
-        "formatted network parameter name on the "
-        "following OS::Neutron::Ports: "
-        "{}".format(", ".join(invalid_ports))
-    )
-
-
 @validates("R-16968", "R-35666")
 def test_network_resource_id_format(yaml_file):
     """
@@ -119,7 +84,7 @@ def test_network_resource_id_format(yaml_file):
 
     assert not set(invalid_networks), (
         "Heat templates must only create internal networks "
-        "and follow format int_{network-role}_network"
+        "and follow format int_{{network-role}}_network"
         "{}".format(", ".join(invalid_networks))
     )