vCenter driver is capable of import network names with slashes (5.4) (#…

…2021)
OpenNebula · Apr 24, 2018 · 5bdb878 · 5bdb878
1 parent bdb496d
commit 5bdb878
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/network.rb b/src/vmm_mad/remotes/lib/vcenter_driver/network.rb
@@ -100,22 +100,26 @@ def self.to_one_template(network_name, network_ref, network_type,
 
         one_tmp = {}
 
+        bridge_name = network_name
+        network_name = network_name.gsub("/","_")
+
+
         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[: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[:cluster]          = ccr_name
         one_tmp[:cluster_location] = cluster_location
         one_tmp[:vcenter_ccr_ref]  = ccr_ref
         one_tmp[:one_cluster_id]   = cluster_id
         one_tmp[:vcenter_net_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,
                              ccr_ref, vcenter_uuid, unmanaged, template_ref, dc_ref, template_id)
         return one_tmp
     end