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
[VVP] Flag duplicate parameters in .env files
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
utils
/
vm_types.py
diff --git
a/ice_validator/tests/utils/vm_types.py
b/ice_validator/tests/utils/vm_types.py
index
c531b67
..
12fc5a2
100644
(file)
--- a/
ice_validator/tests/utils/vm_types.py
+++ b/
ice_validator/tests/utils/vm_types.py
@@
-50,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 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"]
return set()
key_values = ["name", "flavor", "image"]
@@
-69,9
+63,9
@@
def get_vm_types_for_resource(resource):
vm_types = []
for k2, v2 in resource["properties"].items():
vm_types = []
for k2, v2 in resource["properties"].items():
- if
k2 not in key_values:
- continue
-
if "get_param" not in v2
:
+ if
not isinstance(v2, dict) or 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:
continue
formats = [v for v in key_value_formats if v[0] == k2]
for v3 in formats:
@@
-85,6
+79,16
@@
def get_vm_types_for_resource(resource):
return set(vm_types)
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
def get_vm_type_for_nova_server(resource):
"""
Get the vm_type for a resource
@@
-95,7
+99,7
@@
def get_vm_type_for_nova_server(resource):
vm_types = get_vm_types_for_resource(resource)
# if more than one vm_type was identified, return None
vm_types = get_vm_types_for_resource(resource)
# if more than one vm_type was identified, return None
- if len(vm_types) > 1:
+ if
not vm_types or
len(vm_types) > 1:
return None
return vm_types.pop()
return None
return vm_types.pop()