From 5331da83215f25069791c2403a2a453e09e1c450 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 11 Mar 2022 14:21:36 +0100 Subject: [PATCH] F #5767: Allow empty VM_PREFIX (cherry picked from commit 861532c8c8e0e3ec61d73c0bc076217523cf906d) --- src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb | 2 +- src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb index a406e26c64..46744054cd 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb @@ -261,7 +261,7 @@ module VCenterDriver # Let's try to find the VM object only by its name # Let's build the VM name vm_prefix = host['TEMPLATE/VM_PREFIX'] - vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? || vm_prefix.empty? + vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? vm_prefix.gsub!('$i', one_vm['ID']) vm_name = vm_prefix + one_vm['NAME'] diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb index e737937bde..10c580073e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -471,7 +471,7 @@ end # @return String vcenter name def vc_name vm_prefix = host['TEMPLATE/VM_PREFIX'] - vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? || vm_prefix.empty? + vm_prefix = VM_PREFIX_DEFAULT if vm_prefix.nil? if !one_item['USER_TEMPLATE/VM_PREFIX'].nil? vm_prefix = one_item['USER_TEMPLATE/VM_PREFIX']