vmreverter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71bee61dcff4fab8db12f0a51a05adbb16ed0a46
-  data.tar.gz: b7dca1e2f746b87b142d52b85a8b34eb120de27e
+  metadata.gz: 59e8a9fe0161250b23680ca5d9ab363690bbb593
+  data.tar.gz: eb23f05cabfcfd968fcbc76ba3d09dcc6481092a
 SHA512:
-  metadata.gz: 20a8134933876108d1f3e1c2165c179908097382b59604b17dff6710f1dc4d0e31b73373c92f5ad54bfd81d77a3029e0af5069a1a25223b635307ccff867bf88
-  data.tar.gz: 36122ffdd382b0b930d95986698e9ed9228bef08dbcd90f3a9b5795b161126ef768a493631b82e3b6af5951e656d358b53865bbf2163d47a4afdb38bedf50adb
+  metadata.gz: aab154a683e29d190f7b178672f2dc1ae0140686ce09e69444497402dc3086e0a4b57877e7d830cb42608e90224cf5529855ec1ca11141da1c853ec85ee215cb
+  data.tar.gz: 4c66f97aa9fb47619eed1d88b55c7cc3e9f7e6bbee3abe9422628dc26dadc24dbe5d2cd895d1f7664ecb2184675c93578e70ecd86d7e82575befbcc763ea9518

data/lib/vmreverter/hypervisor/vsphere.rb

@@ -13,7 +13,11 @@ module Vmreverter
 
       @logger.notify "Connecting to vSphere at #{vsphere_credentials[:server]}" + " with credentials for #{vsphere_credentials[:user]}"
 
-      @vsphere_helper = VsphereHelper.new( vsphere_credentials )
+      begin
+        @vsphere_helper = VsphereHelper.new( vsphere_credentials, @logger )
+      rescue Exception => e
+        report_and_raise(@logger, e, "VSphere::connection")
+      end
 
       #Transpose Hash for @vsphere_vms = {"test-server01" => "gold-image", "test-server02" => "silver-image"}
       @vsphere_vms = {}

data/lib/vmreverter/hypervisor/vsphere_helper.rb

@@ -1,14 +1,8 @@
 # Apache Licensed - (github/puppetlabs) ripped from puppet_acceptance. ** See Legal notes
 # Changes include namespace swaps, and refactoring
 
-begin
-  require 'Vmreverter/logger'
-rescue LoadError
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'logger.rb'))
-end
-
 class VsphereHelper
-  
+
   #Class methods
   def self.load_config authfile
     vsphere_credentials = {}
@@ -19,7 +13,7 @@ class VsphereHelper
       vInfo = YAML.load_file( File.join(ENV['HOME'], '.fog') )
     else
       report_and_raise(@logger, RuntimeError.new("Couldn't authentication for vSphere in auth file !"), "VSphereHelper::load_config")
-    end  
+    end
 
     begin
       vsphere_credentials[:server] = vInfo[:default][:vsphere_server]
@@ -32,23 +26,24 @@ class VsphereHelper
     return vsphere_credentials
   end
 
-  def initialize vInfo = {}
-    @logger = vInfo[:logger] || Vmreverter::Logger.new
+  def initialize(vInfo, logger)
+
+    @logger = logger
     begin
       require 'rbvmomi'
     rescue LoadError
       raise "Unable to load RbVmomi, please ensure its installed"
     end
-    
-    # If you don’t have trusted SSL certificates installed on the host you’re connecting to, 
-    #you’ll get an +OpenSSL::SSL::SSLError+ “certificate verify failed”. 
+
+    # If you don’t have trusted SSL certificates installed on the host you’re connecting to,
+    #you’ll get an +OpenSSL::SSL::SSLError+ “certificate verify failed”.
     #You can work around this by using the :insecure option to +RbVmomi::VIM.connect+.
-    
+
     @connection = RbVmomi::VIM.connect :host     => vInfo[:server],
                                        :user     => vInfo[:user],
                                        :password => vInfo[:pass],
                                        :insecure => true
-  end  
+  end
   #Instance Methods
   def find_snapshot vm, snapname
     search_child_snaps vm.snapshot.rootSnapshotList, snapname
@@ -184,4 +179,3 @@ class VsphereHelper
     @connection.close
   end
 end
-

data/lib/vmreverter/version.rb

@@ -1,3 +1,3 @@
 module Vmreverter
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmreverter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - shadowbq