From 82c8fcbf975c17d29dd690510abd46f03955ce0f Mon Sep 17 00:00:00 2001 From: Sergio Semedi Barranco Date: Fri, 27 Oct 2017 15:22:37 +0200 Subject: [PATCH] B #5286: imported vnet real hash names (#542) * B #5286: imported networks from templates are 'properly' hashed * B #5286: imported wilds have the real vnet name --- src/vmm_mad/remotes/lib/vcenter_driver/network.rb | 12 ++++-------- .../remotes/lib/vcenter_driver/vi_helper.rb | 15 +++++++++++++++ .../remotes/lib/vcenter_driver/virtual_machine.rb | 5 ++++- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb index e7db89a5be..976a871413 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb @@ -100,14 +100,10 @@ class Network one_tmp = {} - if unmanaged && unmanaged == "wild" - network_import_name = "#{network_name} [VM #{vm_or_template_name}]" - else - hash_name = "#{network_name} - #{ccr_name.tr(" ", "_")} [#{vcenter_instance_name} - #{dc_name}]_#{cluster_location}" - sha256 = Digest::SHA256.new - network_hash = sha256.hexdigest(hash_name)[0..11] - network_import_name = "#{network_name} - #{ccr_name.tr(" ", "_")} [#{vcenter_instance_name} - #{dc_name}]_#{network_hash}" - end + hash_name = "#{network_name} - #{ccr_name.tr(" ", "_")} [#{vcenter_instance_name} - #{dc_name}]_#{cluster_location}" + sha256 = Digest::SHA256.new + network_hash = sha256.hexdigest(hash_name)[0..11] + network_import_name = "#{network_name} - #{ccr_name.tr(" ", "_")} [#{vcenter_instance_name} - #{dc_name}]_#{network_hash}" one_tmp[:name] = network_name one_tmp[:import_name] = network_import_name 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 e87aa481fb..3504c5c9ca 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb @@ -157,6 +157,21 @@ class VIHelper end end + def self.get_location(item) + folders = [] + while !item.instance_of? RbVmomi::VIM::Datacenter + item = item.parent + if !item.instance_of? RbVmomi::VIM::Datacenter + folders << item.name if item.name != "host" + end + raise "Could not find the location" if item.nil? + end + location = folders.reverse.join("/") + location = "/" if location.empty? + + return location + end + end # class VIHelper end # module VCenterDriver 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 7fa1c7009a..d165a4754d 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb @@ -437,6 +437,9 @@ class Template ar_size = 255 end + net_host = VCenterDriver::ClusterComputeResource.new_from_ref(ccr_ref, @vi_client) + location = VCenterDriver::VIHelper.get_location(net_host.item) + # Prepare the Virtual Network template one_vnet = VCenterDriver::Network.to_one_template(nic[:net_name], nic[:net_ref], @@ -447,7 +450,7 @@ class Template vcenter_instance_name, dc_name, cluster_id, - nil, + location, unmanaged, template_ref, dc_ref,