From 880dac14014ad200039956dae97e031b6fae5cbc Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 19 Sep 2014 11:28:35 +0200
Subject: [PATCH] Feature #2911: Polising refactor

---
 src/im_mad/remotes/vcenter.d/vcenter.rb       |  7 ++++---
 src/vmm_mad/remotes/vcenter/deploy            | 13 +++++++------
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb |  8 +++++---
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/im_mad/remotes/vcenter.d/vcenter.rb b/src/im_mad/remotes/vcenter.d/vcenter.rb
index c593386c6a..2d71377083 100644
--- a/src/im_mad/remotes/vcenter.d/vcenter.rb
+++ b/src/im_mad/remotes/vcenter.d/vcenter.rb
@@ -34,13 +34,14 @@ if !host_id
     exit -1
 end
 
-vcenter_host = VCenterDriver::VCenterHost.new(host_id)
+vi_client    = VCenterDriver::VIClient.new host_id
+
+vcenter_host = VCenterDriver::VCenterHost.new vi_client
 
 cluster_info = vcenter_host.monitor_cluster
-
 cluster_info << vcenter_host.monitor_host_systems
-
 vm_monitor_info = vcenter_host.monitor_vms
+
 cluster_info << "\nVM_POLL=YES"
 cluster_info << "#{vm_monitor_info}" if !vm_monitor_info.empty?
 
diff --git a/src/vmm_mad/remotes/vcenter/deploy b/src/vmm_mad/remotes/vcenter/deploy
index af738f359b..7a2a79c35f 100644
--- a/src/vmm_mad/remotes/vcenter/deploy
+++ b/src/vmm_mad/remotes/vcenter/deploy
@@ -33,10 +33,11 @@ dfile = ARGV[0]
 host  = ARGV[1]
 id    = ARGV[2]
 
-vcenter_vm = VCenterDriver::VCenterVm.new
+begin
+    puts VCenterDriver::VCenterVm.deploy dfile
+    exit 0
+rescue Exception => e
+    STDERR.puts "Deploy of VM #{id} on host #{host} with #{dfile} failed \
+                 due to #{e.message}"
+end
 
-vcenter_vm.deploy 
-
-puts vmware_drv.deploy(dfile, id)
-
-exit 0
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index 0c125f986a..cd0aeb054d 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -114,8 +114,10 @@ class VIClient
             next if ccrs.nil?
 
             @cluster = ccrs.find{ |ccr|
-                @host.name == ccr.name
+                @one_host.name == ccr.name
             }
+
+            break if @cluster
         }
 
         return @cluster
@@ -263,7 +265,7 @@ class VCenterVm
     #  Creates a new VIVm using a RbVmomi::VirtualMachine object
     #    @param vm_vi [RbVmomi::VirtualMachine] it will be used if not nil
     ########################################################################
-    def initialize(vm_vi, client)
+    def initialize(client, vm_vi )
         @vm     = vm_vi
         @client = client
 
@@ -274,7 +276,7 @@ class VCenterVm
         @net_tx = 0
     end
 
-    def self.deploy(host, xml_text, vmid)
+    def self.deploy(xml_text)
 
         xml = REXML::Document.new xml_text