[VVP] Updating vm_type class test to proceed if no cinder

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

diff --git a/ice_validator/tests/test_nova_servers_vm_types.py b/ice_validator/tests/test_nova_servers_vm_types.py
index 97b6418..36ada32 100644 (file)
--- a/ice_validator/tests/test_nova_servers_vm_types.py
+++ b/ice_validator/tests/test_nova_servers_vm_types.py
@@ -42,7 +42,7 @@ import re
 
 from tests import cached_yaml as yaml
 
 
 from tests import cached_yaml as yaml
 

-from .helpers import validates
+from .helpers import validates, is_nova_server

 
 from .utils.vm_types import get_vm_types_for_resource, get_vm_types
 
 
 from .utils.vm_types import get_vm_types_for_resource, get_vm_types
 


@@ -50,12 +50,12 @@ from .utils.network_roles import get_network_roles
 
 
 @validates("R-57282")
 
 
 @validates("R-57282")

-def test_vm_type_consistent_on_nova_servers(heat_template):
+def test_vm_type_consistent_on_nova_servers(yaml_file):

     """
     Make sure all nova servers have properly formatted properties
     for their name, image and flavor
     """
     """
     Make sure all nova servers have properly formatted properties
     for their name, image and flavor
     """

-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:

         yml = yaml.load(fh)
 
     # skip if resources are not defined
         yml = yaml.load(fh)
 
     # skip if resources are not defined


@@ -64,13 +64,8 @@ def test_vm_type_consistent_on_nova_servers(heat_template):
 
     invalid_nova_servers = []
     for k, v in yml["resources"].items():
 
     invalid_nova_servers = []
     for k, v in yml["resources"].items():

-        if not isinstance(v, dict):
-            continue
-        if v.get("type") != "OS::Nova::Server":
-            continue
-        if "properties" not in v:
+        if not is_nova_server(v):

             continue
             continue

-

         vm_types = get_vm_types_for_resource(v)
         if len(vm_types) != 1:
             invalid_nova_servers.append(k)
         vm_types = get_vm_types_for_resource(v)
         if len(vm_types) != 1:
             invalid_nova_servers.append(k)