Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[VVP] Fix issue floating IP params for R-35666"
[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
d3d0dbb
..
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
@@
-64,13
+64,8
@@
def test_vm_type_consistent_on_nova_servers(yaml_file):
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":
+ if not is_nova_server(v):
continue
continue
- if "properties" not in v:
- 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)