Merge "Sonarfix in structures.py"
authorSteven Wright <sw3588@att.com>
Fri, 4 Oct 2019 17:11:21 +0000 (17:11 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 4 Oct 2019 17:11:21 +0000 (17:11 +0000)
ice_validator/tests/test_network_format.py

index e360795..de8115d 100644 (file)
@@ -112,11 +112,11 @@ def test_network_has_subnet(yaml_file):
         networks.append(k)
 
     for k, v in yml["resources"].items():
-        if not has_properties(v) and 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: