X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Futils%2Fvm_types.py;h=56d824b0fc41f9176f34ad31bf1e22ff9e2e79b2;hb=419066fa60b2d18e768c0c572951bbf048c5af6f;hp=ae6d7ff9d44898e0e3af3d0993997d82afa87c89;hpb=1d319a416ba8f0cb764d86323f78318b0d3a8f4c;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index ae6d7ff..56d824b 100644
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -50,8 +50,6 @@ def get_vm_types_for_resource(resource):
     - If more than one vm_type is detected all vm_types will
     be returned
     """
-    if not isinstance(resource, dict):
-        return set()
     if not is_nova_server(resource):
         return set()
 
@@ -65,9 +63,7 @@ def get_vm_types_for_resource(resource):
 
     vm_types = []
     for k2, v2 in resource["properties"].items():
-        if k2 not in key_values:
-            continue
-        if "get_param" not in v2:
+        if any([k2 not in key_values, "get_param" not in v2]):
             continue
         formats = [v for v in key_value_formats if v[0] == k2]
         for v3 in formats:
@@ -83,11 +79,7 @@ def get_vm_types_for_resource(resource):
 
 def is_nova_server(resource):
 
-    return (
-        "type" in resource
-        and "properties" in resource
-        and resource.get("type") == "OS::Nova::Server"
-    )
+    return isinstance(resource, dict) and "type" in resource and "properties" in resource and resource.get("type") == "OS::Nova::Server"
 
 
 def get_vm_type_for_nova_server(resource):