diff options
author | 2018-09-13 16:49:43 -0700 | |
---|---|---|
committer | 2018-09-13 17:21:45 -0700 | |
commit | 31d5da59b39d38760cc519a2c5e5b70357b539e8 (patch) | |
tree | 7298d118aefb1e7494afa5cbedaa5e499b78373d /ice_validator/tests/utils/vm_types.py | |
parent | 8de26dd1cc9ed33c3ab85a5014ac949f174db932 (diff) |
[VVP] udpating scripts for casablanca
adding new "infrastructure" scripts
addresses bugs VVP-100, VVP-101, VVP-102
adding base tests
updating tests where arguments have changed
Adds traceability for task VVP-92
Change-Id: I067d8e80934403039e66fbc9fc93766587f67b4e
Issue-ID: VVP-80
Signed-off-by: stark, steven <ss820f@att.com>
Diffstat (limited to 'ice_validator/tests/utils/vm_types.py')
-rw-r--r-- | ice_validator/tests/utils/vm_types.py | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py index 78006b9..6802666 100644 --- a/ice_validator/tests/utils/vm_types.py +++ b/ice_validator/tests/utils/vm_types.py @@ -42,33 +42,36 @@ import re def get_vm_types_for_resource(resource): - """ + ''' Get all unique vm_types for a resource Notes: - Returns set([]) if the resource is not formatted properly, the passed resource is not a nova server - 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: + if 'type' not in resource: return set() - if resource["type"] != "OS::Nova::Server": + if resource['type'] != 'OS::Nova::Server': return set() - if "properties" not in resource: + if 'properties' not in resource: return set() key_values = ["name", "flavor", "image"] key_value_formats = [ - ["name", "string", re.compile(r"(.+?)_name_\d+")], - ["name", "comma_delimited_list", re.compile(r"(.+?)_names")], - ["flavor", "string", re.compile(r"(.+?)_flavor_name")], - ["image", "string", re.compile(r"(.+?)_image_name")], - ] + ["name", "string", + re.compile(r'(.+?)_name_\d+')], + ["name", "comma_delimited_list", + re.compile(r'(.+?)_names')], + ["flavor", "string", + re.compile(r'(.+?)_flavor_name')], + ["image", "string", + re.compile(r'(.+?)_image_name')]] vm_types = [] - for k2, v2 in resource["properties"].items(): + for k2, v2 in resource['properties'].items(): if k2 not in key_values: continue if "get_param" not in v2: @@ -86,12 +89,12 @@ def get_vm_types_for_resource(resource): def get_vm_type_for_nova_server(resource): - """ + ''' Get the vm_type for a resource Note: Returns None if not exactly one vm_type is detected, if the resource is not formatted properly, or the passed resource is not a nova server - """ + ''' vm_types = get_vm_types_for_resource(resource) # if more than one vm_type was identified, return None @@ -102,10 +105,10 @@ def get_vm_type_for_nova_server(resource): def get_vm_types(resources): - """ + ''' Get all vm_types for a list of heat resources, do note that some of the values retrieved may be invalid - """ + ''' vm_types = [] for v in resources.values(): vm_types.extend(list(get_vm_types_for_resource(v))) |