shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-13 12:58:17 +03:00
Code Releases Wiki Activity

F #4913: Shorter vCenter templates import name (max 80 chars)

Browse Source
This commit is contained in:
mcabrerizo 2017-06-12 18:03:31 +02:00
parent e86ff9e1ae
commit 0586617714
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -748,7 +748,7 @@ class Template
template_hash = sha256.hexdigest(full_name)[0..11]
template_name = template_name.tr("\u007F", "")
template_ccr_name = template_ccr_name.tr("\u007F", "")
import_name = "#{template_name} - #{template_ccr_name} [#{vcenter_instance_name} - #{dc_name}]_#{template_hash}"
import_name = "#{template_name} - #{template_ccr_name} #{template_hash}"
# Prepare the Hash that will be used by importers to display
# the object being imported
@ -773,11 +773,12 @@ class Template
"TEMPLATE/VCENTER_CCR_REF",
template_ccr_ref,
vcenter_uuid)
host_id = one_host["ID"]
host_id = one_host["ID"]
cluster_id = one_host["CLUSTER_ID"]
raise "Could not find the host's ID associated to template being imported" if !host_id
# Get the OpenNebula's template hash
one_tmp[:one] = template_to_one(template, vcenter_uuid, template_ccr_ref, template_ccr_name, import_name, host_id)
one_tmp[:one] = template_to_one(template, vcenter_uuid, template_ccr_ref, template_ccr_name, import_name, host_id, cluster_id)
return one_tmp
rescue
return nil