[VVP] Bug fix if resource value is hardcoded 39/96639/1
authorstark, steven <steven.stark@att.com>
Fri, 4 Oct 2019 20:09:28 +0000 (13:09 -0700)
committerstark, steven <steven.stark@att.com>
Fri, 4 Oct 2019 20:10:53 +0000 (13:10 -0700)
If the property value isn't a dictionary than the test run crashes

Issue-ID: VVP-313
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I926bc233909db245d5a051035f26fefaa39b5ede

ice_validator/tests/utils/vm_types.py

index 56d824b..e0ea7e7 100644 (file)
@@ -63,7 +63,9 @@ def get_vm_types_for_resource(resource):
 
     vm_types = []
     for k2, v2 in resource["properties"].items():
-        if any([k2 not in key_values, "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:
@@ -79,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):