From b8e10ff73d5d72a8ede280a7ca29cc3e5e5cf976 Mon Sep 17 00:00:00 2001 From: "Gary T. Giesen" Date: Mon, 23 May 2022 01:49:45 -0400 Subject: [PATCH 1/2] Fix 'NameError: name 'datacenter_name' is not defined' in vmware_vm.relocate --- src/saltext/vmware/modules/vm.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/saltext/vmware/modules/vm.py b/src/saltext/vmware/modules/vm.py index a9f3599d..5009d38e 100644 --- a/src/saltext/vmware/modules/vm.py +++ b/src/saltext/vmware/modules/vm.py @@ -490,7 +490,7 @@ def snapshot(vm_name, datacenter_name=None, service_instance=None): return {"snapshots": snapshots} -def relocate(vm_name, new_host_name, datastore_name, service_instance=None): +def relocate(vm_name, new_host_name, datastore_name, datacenter_name=None, service_instance=None): """ Relocates a virtual machine to the location specified. @@ -503,6 +503,9 @@ def relocate(vm_name, new_host_name, datastore_name, service_instance=None): datastore_name The name of the datastore you want to move the virtual machine to. + datacenter_name + (optional) The name of the datacenter containing the virtual machine. + service_instance (optional) The Service Instance from which to obtain managed object references. """ @@ -511,9 +514,14 @@ def relocate(vm_name, new_host_name, datastore_name, service_instance=None): vm_ref = utils_common.get_mor_by_property(service_instance, vim.VirtualMachine, vm_name) resources = utils_common.deployment_resources(new_host_name, service_instance) assert isinstance(datastore_name, str) - datastores = utils_datastore.get_datastores( - service_instance, datastore_name=datastore_name, datacenter_name=datacenter_name - ) + if datacenter_name: + datastores = utils_datastore.get_datastores( + service_instance, datastore_name=datastore_name, datacenter_name=datacenter_name + ) + else: + datastores = utils_datastore.get_datastores( + service_instance, datastore_name=datastore_name + ) datastore_ref = datastores[0] if datastores else None ret = utils_vm.relocate( vm_ref, resources["destination_host"], datastore_ref, resources["resource_pool"] From 22fde4641311457b9f2243a4a2cb9e7161ebdd5e Mon Sep 17 00:00:00 2001 From: "Gary T. Giesen" Date: Mon, 23 May 2022 01:59:38 -0400 Subject: [PATCH 2/2] Make pre-commit happy --- src/saltext/vmware/modules/vm.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/saltext/vmware/modules/vm.py b/src/saltext/vmware/modules/vm.py index 5009d38e..946edd79 100644 --- a/src/saltext/vmware/modules/vm.py +++ b/src/saltext/vmware/modules/vm.py @@ -519,9 +519,7 @@ def relocate(vm_name, new_host_name, datastore_name, datacenter_name=None, servi service_instance, datastore_name=datastore_name, datacenter_name=datacenter_name ) else: - datastores = utils_datastore.get_datastores( - service_instance, datastore_name=datastore_name - ) + datastores = utils_datastore.get_datastores(service_instance, datastore_name=datastore_name) datastore_ref = datastores[0] if datastores else None ret = utils_vm.relocate( vm_ref, resources["destination_host"], datastore_ref, resources["resource_pool"]