X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=blobdiff_plain;f=ice_validator%2Ftests%2Futils%2Fvm_types.py;h=ae14336914aa2a4855705da7f2daadf6f59db167;hp=c531b6735ca019a45195add10f8320f05599f0f8;hb=c945b7e0efafee4a46bdf295a22ceff2f0b63e49;hpb=84db7f8f65cd0ec77f09cfde365599df9890ce6c

diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index c531b67..ae14336 100644
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -52,11 +52,7 @@ def get_vm_types_for_resource(resource):
     """
     if not isinstance(resource, dict):
         return set()
-    if "type" not in resource:
-        return set()
-    if resource["type"] != "OS::Nova::Server":
-        return set()
-    if "properties" not in resource:
+    if not is_nova_server(resource):
         return set()
 
     key_values = ["name", "flavor", "image"]
@@ -85,6 +81,11 @@ def get_vm_types_for_resource(resource):
     return set(vm_types)
 
 
+def is_nova_server(resource):
+
+    return "type" in resource and "properties" in resource and resource.get("type") == "OS::Nova::Server"
+
+
 def get_vm_type_for_nova_server(resource):
     """
     Get the vm_type for a resource