shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-25 06:03:36 +03:00
Code Releases Wiki Activity

B #3430: vCenter cache vcenter uuid reference

Browse Source 
Until now, objects caching depends on the VCENTER_INSTANCE_ID
attribute being present in the objects XML. This prevents the
correct retrieval if the objects XML is empty. Now the uuid
can be passed explicitly.

(cherry picked from commit cbe4f7715081311bdd63a26596bf28e196d92f51)
This commit is contained in:
Tino Vazquez 2019-06-14 13:28:04 +02:00
parent 7e24c066bd
commit 995ec0ca7d
No known key found for this signature in database
GPG Key ID: 2FE9C32E94AEABBE
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb
View File

@ -130,7 +130,7 @@ class VIHelper
one_name(the_class, name, key, pool, bytes+2)
end
def self.get_ref_key(element, attribute)
def self.get_ref_key(element, attribute, vcenter_uuid = nil)
key = element[attribute]
tvid = element["TEMPLATE/VCENTER_INSTANCE_ID"]
@ -140,16 +140,18 @@ class VIHelper
key += tvid
elsif uvid
key += uvid
elsif vcenter_uuid
key += vcenter_uuid
end
return key
end
def self.create_ref_hash(attribute, pool)
def self.create_ref_hash(attribute, pool, vcenter_uuid = nil)
hash = {}
pool.each_element(Proc.new do |e|
refkey = get_ref_key(e, attribute)
refkey = get_ref_key(e, attribute, vcenter_uuid)
hash[refkey] = e
end)
@ -185,7 +187,9 @@ class VIHelper
@ref_hash ||= {}
if @ref_hash[attribute].nil? || @ref_hash[attribute] == {}
@ref_hash[attribute] = create_ref_hash(attribute, pool)
@ref_hash[attribute] = create_ref_hash(attribute,
pool,
vcenter_uuid)
end
refkey = ""