change if bad to assert not bad, message

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

diff --git a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
index 2f69b52..ce653f6 100644 (file)
--- a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
+++ b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
@@ -35,21 +35,20 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 import pytest
 from tests import cached_yaml as yaml
 
-from .helpers import validates
+from .helpers import validates, is_nova_server
 
 
 @validates("R-901331", "R-481670", "R-663631")
-def test_vm_type_assignments_on_nova_servers_only_use_get_param(heat_template):
+def test_vm_type_assignments_on_nova_servers_only_use_get_param(yaml_file):
     """
     Make sure all nova servers only use get_param for their properties
     """
-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
     # skip if resources are not defined
@@ -60,13 +59,7 @@ def test_vm_type_assignments_on_nova_servers_only_use_get_param(heat_template):
     invalid_nova_servers = set()
 
     for k, v in yml["resources"].items():
-        if not isinstance(v, dict):
-            continue
-        if "properties" not in v:
-            continue
-        if "type" not in v:
-            continue
-        if v["type"] != "OS::Nova::Server":
+        if not is_nova_server(v):
             continue
 
         for k2, v2 in v["properties"].items():