Lint: E302 expected 2 blank lines, found X
This commit is contained in:
		| @@ -29,6 +29,7 @@ import daemon_lib.common as common | ||||
|  | ||||
| import daemon_lib.ceph as ceph | ||||
|  | ||||
|  | ||||
| # | ||||
| # Cluster search functions | ||||
| # | ||||
| @@ -41,6 +42,7 @@ def getClusterDomainList(zk_conn): | ||||
|         name_list.append(zkhandler.readdata(zk_conn, '/domains/%s' % uuid)) | ||||
|     return uuid_list, name_list | ||||
|  | ||||
|  | ||||
| def searchClusterByUUID(zk_conn, uuid): | ||||
|     try: | ||||
|         # Get the lists | ||||
| @@ -55,6 +57,7 @@ def searchClusterByUUID(zk_conn, uuid): | ||||
|  | ||||
|     return name | ||||
|  | ||||
|  | ||||
| def searchClusterByName(zk_conn, name): | ||||
|     try: | ||||
|         # Get the lists | ||||
| @@ -69,6 +72,7 @@ def searchClusterByName(zk_conn, name): | ||||
|  | ||||
|     return uuid | ||||
|  | ||||
|  | ||||
| def getDomainUUID(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     if common.validateUUID(domain): | ||||
| @@ -80,6 +84,7 @@ def getDomainUUID(zk_conn, domain): | ||||
|  | ||||
|     return dom_uuid | ||||
|  | ||||
|  | ||||
| def getDomainName(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     if common.validateUUID(domain): | ||||
| @@ -91,6 +96,7 @@ def getDomainName(zk_conn, domain): | ||||
|  | ||||
|     return dom_name | ||||
|  | ||||
|  | ||||
| # | ||||
| # Direct functions | ||||
| # | ||||
| @@ -106,6 +112,7 @@ def is_migrated(zk_conn, domain): | ||||
|     else: | ||||
|         return False | ||||
|  | ||||
|  | ||||
| def flush_locks(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -145,6 +152,7 @@ def flush_locks(zk_conn, domain): | ||||
|  | ||||
|     return success, message | ||||
|  | ||||
|  | ||||
| def define_vm(zk_conn, config_data, target_node, node_limit, node_selector, node_autostart, migration_method=None, profile=None, initial_state='stop'): | ||||
|     # Parse the XML data | ||||
|     try: | ||||
| @@ -204,6 +212,7 @@ def define_vm(zk_conn, config_data, target_node, node_limit, node_selector, node | ||||
|  | ||||
|     return True, 'Added new VM with Name "{}" and UUID "{}" to database.'.format(dom_name, dom_uuid) | ||||
|  | ||||
|  | ||||
| def modify_vm_metadata(zk_conn, domain, node_limit, node_selector, node_autostart, provisioner_profile, migration_method): | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
|     if not dom_uuid: | ||||
| @@ -236,6 +245,7 @@ def modify_vm_metadata(zk_conn, domain, node_limit, node_selector, node_autostar | ||||
|  | ||||
|     return True, 'Successfully modified PVC metadata of VM "{}".'.format(domain) | ||||
|  | ||||
|  | ||||
| def modify_vm(zk_conn, domain, restart, new_vm_config): | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
|     if not dom_uuid: | ||||
| @@ -277,6 +287,7 @@ def modify_vm(zk_conn, domain, restart, new_vm_config): | ||||
|  | ||||
|     return True, '' | ||||
|  | ||||
|  | ||||
| def dump_vm(zk_conn, domain): | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
|     if not dom_uuid: | ||||
| @@ -287,6 +298,7 @@ def dump_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, vm_xml | ||||
|  | ||||
|  | ||||
| def undefine_vm(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -314,6 +326,7 @@ def undefine_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, 'Undefined VM "{}" from the cluster.'.format(domain) | ||||
|  | ||||
|  | ||||
| def remove_vm(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -353,6 +366,7 @@ def remove_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, 'Removed VM "{}" and disks from the cluster.'.format(domain) | ||||
|  | ||||
|  | ||||
| def start_vm(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -367,6 +381,7 @@ def start_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, 'Starting VM "{}".'.format(domain) | ||||
|  | ||||
|  | ||||
| def restart_vm(zk_conn, domain, wait=False): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -393,6 +408,7 @@ def restart_vm(zk_conn, domain, wait=False): | ||||
|  | ||||
|     return True, retmsg | ||||
|  | ||||
|  | ||||
| def shutdown_vm(zk_conn, domain, wait=False): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -419,6 +435,7 @@ def shutdown_vm(zk_conn, domain, wait=False): | ||||
|  | ||||
|     return True, retmsg | ||||
|  | ||||
|  | ||||
| def stop_vm(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -433,6 +450,7 @@ def stop_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, 'Forcibly stopping VM "{}".'.format(domain) | ||||
|  | ||||
|  | ||||
| def disable_vm(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -452,6 +470,7 @@ def disable_vm(zk_conn, domain): | ||||
|  | ||||
|     return True, 'Marked VM "{}" as disable.'.format(domain) | ||||
|  | ||||
|  | ||||
| def move_vm(zk_conn, domain, target_node, wait=False, force_live=False): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -514,6 +533,7 @@ def move_vm(zk_conn, domain, target_node, wait=False, force_live=False): | ||||
|  | ||||
|     return True, retmsg | ||||
|  | ||||
|  | ||||
| def migrate_vm(zk_conn, domain, target_node, force_migrate, wait=False, force_live=False): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -579,6 +599,7 @@ def migrate_vm(zk_conn, domain, target_node, force_migrate, wait=False, force_li | ||||
|  | ||||
|     return True, retmsg | ||||
|  | ||||
|  | ||||
| def unmigrate_vm(zk_conn, domain, wait=False, force_live=False): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -619,6 +640,7 @@ def unmigrate_vm(zk_conn, domain, wait=False, force_live=False): | ||||
|  | ||||
|     return True, retmsg | ||||
|  | ||||
|  | ||||
| def get_console_log(zk_conn, domain, lines=1000): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -634,6 +656,7 @@ def get_console_log(zk_conn, domain, lines=1000): | ||||
|  | ||||
|     return True, loglines | ||||
|  | ||||
|  | ||||
| def get_info(zk_conn, domain): | ||||
|     # Validate that VM exists in cluster | ||||
|     dom_uuid = getDomainUUID(zk_conn, domain) | ||||
| @@ -647,6 +670,7 @@ def get_info(zk_conn, domain): | ||||
|  | ||||
|     return True, domain_information | ||||
|  | ||||
|  | ||||
| def get_list(zk_conn, node, state, limit, is_fuzzy=True): | ||||
|     if node: | ||||
|         # Verify node is valid | ||||
|   | ||||
		Reference in New Issue
	
	Block a user