From d25f5756b204812a4e88b09535ba028d4975fe37 Mon Sep 17 00:00:00 2001 From: Sergio Semedi Barranco Date: Fri, 20 Apr 2018 11:45:54 +0200 Subject: [PATCH] vCenter driver is capable of import network names with slashes (#1996) --- src/vmm_mad/remotes/lib/vcenter_driver/network.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb index c5149ffdbd..7887aa919e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb @@ -120,16 +120,19 @@ class Network vm_or_template_name = opts[:vm_or_template_name] || nil template_id = opts[:template_id] || nil + bridge_name = network_name + network_name = network_name.gsub("/","_") + network_import_name = generate_name(network_name, {:vcenter_name=>vcenter_instance_name, :dc_name=>dc_name}) - one_tmp[:name] = network_name + one_tmp[:name] = bridge_name one_tmp[:import_name] = network_import_name - one_tmp[:bridge] = network_name + one_tmp[:bridge] = bridge_name one_tmp[:type] = network_type one_tmp[:one_cluster_id] = cluster_id one_tmp[:ref] = network_ref - one_tmp[:one] = to_one(network_import_name, network_name, network_ref, network_type, + one_tmp[:one] = to_one(network_import_name, bridge_name, network_ref, network_type, vcenter_uuid, unmanaged, template_ref, dc_ref, template_id) return one_tmp end