From 78652e3716e92bbeb5c93225f39ecaca3b86c8a8 Mon Sep 17 00:00:00 2001
From: semedi <sergio.semedi@gmail.com>
Date: Wed, 21 Feb 2018 10:33:23 +0100
Subject: [PATCH] F #1767: find_by_ref cleaning

---
 .../remotes/lib/vcenter_driver/datacenter.rb  |  3 +-
 .../remotes/lib/vcenter_driver/vi_helper.rb   | 38 ++++++-------------
 .../lib/vcenter_driver/virtual_machine.rb     |  2 +-
 3 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
index 667bf8de99..19105d39ba 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/datacenter.rb
@@ -446,8 +446,7 @@ class DatacenterFolder
                                                                     "TEMPLATE/VCENTER_NET_REF",
                                                                     network_ref,
                                                                     vcenter_uuid,
-                                                                    npool,
-                                                                    false)
+                                                                    npool)
                 end #networks loop
             end #clusters loop
 
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 8fc77d253f..3e315491d4 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/vi_helper.rb
@@ -39,6 +39,15 @@ class VIHelper
         return -1
     end
 
+    def self.one_managed?(object)
+        if object.class.ancestors.include?(OpenNebula::XMLElement)
+            managed = object["TEMPLATE/OPENNEBULA_MANAGED"] || object["USER_TEMPLATE/OPENNEBULA_MANAGED"]
+
+            return managed != "NO"
+        end
+        return false
+    end
+
     def self.one_item(the_class, id, exit_if_fail = true)
         item = the_class.new_with_id(id, client)
         rc = item.info
@@ -93,13 +102,7 @@ class VIHelper
 
         pool.each_element(Proc.new do |e|
             refkey = get_ref_key(e, attribute)
-
-            hash[refkey] = {
-                opennebula_object: e,
-                opennebula_managed: e["TEMPLATE/OPENNEBULA_MANAGED"],
-                tvcenter_instance_id: e["TEMPLATE/VCENTER_INSTANCE_ID"],
-                uvcenter_instance_id: e["USER_TEMPLATE/VCENTER_INSTANCE_ID"]
-            }
+            hash[refkey] =  e
         end)
 
         hash
@@ -113,8 +116,7 @@ class VIHelper
         end
     end
 
-    def self.find_by_ref(the_class, attribute, ref, vcenter_uuid, pool = nil, one_managed = nil)
-        one_managed = one_managed.nil? || one_managed
+    def self.find_by_ref(the_class, attribute, ref, vcenter_uuid, pool = nil)
         pool = one_pool(the_class, false) if pool.nil?
         @ref_hash ||= {}
 
@@ -126,23 +128,7 @@ class VIHelper
         refkey = ref if ref
         refkey += vcenter_uuid if vcenter_uuid
 
-        e = @ref_hash[attribute][refkey]
-
-        return nil if e.nil?
-
-        if one_managed
-            one_managed_test = (!e[:opennebula_managed] || e[:opennebula_managed] != "NO")
-        else
-            one_managed_test = (!e[:opennebula_managed] || e[:opennebula_managed] != "YES")
-        end
-
-        if one_managed_test &&
-            (e[:tvcenter_instance_id] == vcenter_uuid ||
-             e[:uvcenter_instance_id] == vcenter_uuid)
-            return e[:opennebula_object]
-        end
-
-        return nil
+        return @ref_hash[attribute][refkey]
     end
 
     def self.find_image_by(att, the_class, path, ds_id, pool = nil)
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 d6f1fee3b8..97acd9dd34 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -378,7 +378,7 @@ class Template
                                                                 "TEMPLATE/VCENTER_NET_REF",
                                                                  nic[:net_ref],
                                                                  vc_uuid,
-                                                                 npool, false)
+                                                                 npool)
 
                 #Network is already in OpenNebula
                 if network_found