X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Futils%2Fvm_types.py;fp=ice_validator%2Ftests%2Futils%2Fvm_types.py;h=78006b91072ed736ecac35cea827521f92b8308b;hb=f5edc06be0d8bedeb0904b348ba5e3e67c74f186;hp=41da7d935fcf2c3cacfe801de8862d143c379a59;hpb=1af0d577ab6d8c431ae1322657c50efd5e0a1a93;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index 41da7d9..78006b9 100644
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -42,37 +42,33 @@ 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:
@@ -90,12 +86,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
@@ -106,10 +102,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)))