X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_network_format.py;h=de8115d1f68ed8c042d595e9ded27fb0f57b62a6;hb=98d86269d797a390b9e47d41383d0744ea858837;hp=f146f75f4952a6393d885745d75d9ffaca94a1b1;hpb=e5d7862c7c6c02847b8b4f95d2af0c5e9a454828;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index f146f75..de8115d 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -70,9 +70,7 @@ def test_network_resource_id_format(yaml_file):
 
     invalid_networks = []
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
+        if not has_properties(v):
             continue
         if property_uses_get_resource(v, "network"):
             continue
@@ -106,27 +104,19 @@ def test_network_has_subnet(yaml_file):
     networks = []
 
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
+        if not has_properties(v) or v.get("type") not in ["OS::Neutron::Net"]:
             continue
         # need to check if contrail networks also require subnet
         # and it is defined the same as neutron networks
         # if v.get("type") not in NETWORK_RESOURCE_TYPES:
-        if v.get("type") not in ["OS::Neutron::Net"]:
-            continue
         networks.append(k)
 
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if v.get("type") != "OS::Neutron::Subnet":
-            continue
         network_prop = v.get("properties", {}).get("network", {}).get("get_resource")
-
-        if not network_prop:
+        if (
+            not has_properties(v) and v.get("type") != "OS::Neutron::Subnet"
+            and not network_prop
+        ):
             continue
         x = 0
         for network in networks:
@@ -136,3 +126,10 @@ def test_network_has_subnet(yaml_file):
             x += 1
 
     assert not networks, "Networks detected without subnet {}".format(networks)
+
+
+def has_properties(resource):
+    """
+    checks resource is a Neutron Subnet
+    """
+    return isinstance(resource, dict) and "properties" in resource