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=327b75b93096254121e921c467ea3a49c1c545ee;hpb=48a07b6942d3956666d30947372653feb702fdae;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index 327b75b..56d824b 100644
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import re
@@ -51,13 +50,7 @@ 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 "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"]
@@ -70,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:
@@ -86,6 +77,11 @@ def get_vm_types_for_resource(resource):
     return set(vm_types)
 
 
+def is_nova_server(resource):
+
+    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):
     """
     Get the vm_type for a resource