From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 63EE8BB26B for ; Fri, 22 Mar 2024 19:07:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 45BEEA520 for ; Fri, 22 Mar 2024 19:07:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 22 Mar 2024 19:07:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8386641A68 for ; Fri, 22 Mar 2024 19:07:25 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 22 Mar 2024 19:06:23 +0100 Message-Id: <20240322180624.441185-7-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240322180624.441185-1-m.carrara@proxmox.com> References: <20240322180624.441185-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 pve-esxi-import-tools 6/7] listvms: run formatter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Mar 2024 18:07:57 -0000 This commit formats the script using `black -l 80` [0], even though we don't have an official style guide for Python. [0]: https://github.com/psf/black Signed-off-by: Max Carrara --- Changes v1 --> v2: * none listvms.py | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/listvms.py b/listvms.py index 58b09df..90b27bf 100755 --- a/listvms.py +++ b/listvms.py @@ -170,22 +170,29 @@ def list_vms(service_instance: vim.ServiceInstance) -> list[vim.VirtualMachine]: vm_view.Destroy() return vms + def parse_file_path(path) -> tuple[str, Path]: """Parse a path of the form '[datastore] file/path'""" - datastore_name, relative_path = path.split('] ', 1) - datastore_name = datastore_name.strip('[') + datastore_name, relative_path = path.split("] ", 1) + datastore_name = datastore_name.strip("[") return (datastore_name, Path(relative_path)) + def get_vm_vmx_info(vm: vim.VirtualMachine) -> VmVmxInfo: """Extract VMX file path and checksum from a VM object.""" - datastore_name, relative_vmx_path = parse_file_path(vm.config.files.vmPathName) + datastore_name, relative_vmx_path = parse_file_path( + vm.config.files.vmPathName + ) return VmVmxInfo( datastore=datastore_name, path=relative_vmx_path, - checksum=vm.config.vmxConfigChecksum.hex() if vm.config.vmxConfigChecksum else 'N/A' + checksum=vm.config.vmxConfigChecksum.hex() + if vm.config.vmxConfigChecksum + else "N/A", ) + def get_vm_disk_info(vm: vim.VirtualMachine) -> list[VmDiskInfo]: disks = [] for device in vm.config.hardware.device: @@ -196,13 +203,22 @@ def get_vm_disk_info(vm: vim.VirtualMachine) -> list[VmDiskInfo]: disks.append(VmDiskInfo(datastore, path, capacity)) except Exception as err: # if we can't figure out the disk stuff that's fine... - print("failed to get disk information for esxi vm: ", err, file=sys.stderr) + print( + "failed to get disk information for esxi vm: ", + err, + file=sys.stderr, + ) return disks -def get_all_datacenters(service_instance: vim.ServiceInstance) -> list[vim.Datacenter]: + +def get_all_datacenters( + service_instance: vim.ServiceInstance, +) -> list[vim.Datacenter]: """Retrieve all datacenters from the ESXi/vCenter server.""" content = service_instance.content - dc_view = content.viewManager.CreateContainerView(content.rootFolder, [vim.Datacenter], True) + dc_view: Any = content.viewManager.CreateContainerView( + content.rootFolder, [vim.Datacenter], True + ) datacenters = dc_view.view dc_view.Destroy() return datacenters -- 2.39.2