From 0de1ef3780e900a4f2bcbabddf3a9363ca195d71 Mon Sep 17 00:00:00 2001 From: "Carlos J. Herrera" Date: Tue, 30 Mar 2021 11:28:08 -0400 Subject: [PATCH] F #~: fix root template (#1047) Signed-off-by: Carlos Herrera --- .../remotes/lib/vcenter_driver/vm_template.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb index 7b9080c66c..d624a655f3 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb @@ -1659,10 +1659,12 @@ module VCenterDriver folders = [] until item.instance_of? RbVmomi::VIM::Datacenter item = item.parent - first_condition = item.instance_of? RbVmomi::VIM::Datacenter - second_condition = item.name != 'vm' + first_condition = + !(item.instance_of? RbVmomi::VIM::Datacenter) + second_condition = + item.name != 'vm' - unless first_condition && second_condition + if first_condition && second_condition folders << item.name end if item.nil? @@ -1693,8 +1695,8 @@ module VCenterDriver one_tmp[:dc_name] = dc_name one_tmp[:template_name] = template_name one_tmp[:sunstone_template_name]= - "#{template_name} [ Cluster: #{template_ccr_name} \ - - Template location: #{location} ]" + "#{template_name} [ Cluster: #{template_ccr_name}" \ + "- Template location: #{location} ]" one_tmp[:template_location] = location one_tmp[:vcenter_ccr_ref] = template_ccr_ref one_tmp[:vcenter_ref] = template_ref