[VVP] Flag duplicate parameters in .env files

[vvp/validation-scripts.git] / ice_validator / tests / utils / vm_types.py

diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index 7570581..12fc5a2 100644 (file)
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -63,9 +63,9 @@ 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 not isinstance(v2, dict) or 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:
@@ -81,7 +81,12 @@ def get_vm_types_for_resource(resource):
 
 def is_nova_server(resource):
 
-    return isinstance(resource, dict) and "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):
@@ -94,7 +99,7 @@ def get_vm_type_for_nova_server(resource):
     vm_types = get_vm_types_for_resource(resource)
 
     # if more than one vm_type was identified, return None
-    if len(vm_types) > 1:
+    if not vm_types or len(vm_types) > 1:
         return None
 
     return vm_types.pop()