beaker-vcloud 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34b25be97b1bd4227cc5e948afab70cd2a7688fa
-  data.tar.gz: 8ad90b126127596deed42088bb2b7c1a9ff515bd
+  metadata.gz: c9944106974d81daeba568ce19a3fcf839e5b6ff
+  data.tar.gz: 8fa81832fdd04b191f1d33a09cbaaf193546112b
 SHA512:
-  metadata.gz: a091782086e655ce999856574b3fd33c902f835a82be02e5ee3d5ae0769dc8fb4dc76a159511a32eb09c2b8bb4686eba8e6abe398bce49b91c2fb0265b0377bd
-  data.tar.gz: 599120c239a8ef0708d131336f8b721d8152a72f155b504d913423f97454e933f8f436a80fc48f31272b5d1ae1c386c38b1f38244efe0d29ef3c1e30ee641a01
+  metadata.gz: 53d967fecc5ccfe9fc28eec9aad0116ff22c020a827b0b9691d999182f943d8748a6882407d61ca85b9adc6ebddd9367b9e7979a9b76bc988bda898119032c31
+  data.tar.gz: 8468a5544f1d63343d01c0eeec73b9b8ec83d738e522f5299204db6bd1b4e53bd428c85f9be6b073a4c30db2b7e63c16e6f9e2163badd1b2ea0afc204f2cfc62

data/lib/beaker-vcloud/version.rb

@@ -1,3 +1,3 @@
 module BeakerVcloud
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/beaker/hypervisor/vcloud.rb

@@ -25,14 +25,16 @@ module Beaker
       raise 'You must specify a datastore for vCloud instances!' unless @options['datastore']
       raise 'You must specify a folder for vCloud instances!' unless @options['folder']
       raise 'You must specify a datacenter for vCloud instances!' unless @options['datacenter']
-      @vsphere_credentials = VsphereHelper.load_config(@options[:dot_fog])
+      @vcenter_credentials = get_fog_credentials(@options[:dot_fog], @options[:vcenter_instance] || :default)
     end
 
     def connect_to_vsphere
-      @logger.notify "Connecting to vSphere at #{@vsphere_credentials[:server]}" +
-        " with credentials for #{@vsphere_credentials[:user]}"
+      @logger.notify "Connecting to vSphere at #{@vcenter_credentials[:vsphere_server]}" +
+        " with credentials for #{@vcenter_credentials[:vsphere_username]}"
 
-      @vsphere_helper = VsphereHelper.new( @vsphere_credentials )
+      @vsphere_helper = VsphereHelper.new :server => @vcenter_credentials[:vsphere_server],
+                                          :user   => @vcenter_credentials[:vsphere_username],
+                                          :pass   => @vcenter_credentials[:vsphere_password]
     end
 
     def wait_for_dns_resolution host, try, attempts

data/spec/beaker/hypervisor/vcloud_spec.rb

@@ -6,14 +6,16 @@ module Beaker
     before :each do
       MockVsphereHelper.set_config( fog_file_contents )
       MockVsphereHelper.set_vms( make_hosts() )
-     stub_const( "VsphereHelper", MockVsphereHelper )
-     stub_const( "Net", MockNet )
+      stub_const( "VsphereHelper", MockVsphereHelper )
+      stub_const( "Net", MockNet )
       json = double( 'json' )
       allow( json ).to receive( :parse ) do |arg|
         arg
       end
-     stub_const( "JSON", json )
+      stub_const( "JSON", json )
       allow( Socket ).to receive( :getaddrinfo ).and_return( true )
+      allow_any_instance_of( Beaker::Shared ).to receive( :get_fog_credentials ).and_return( fog_file_contents )
+      allow_any_instance_of( VsphereHelper ).to receive( :new ).and_return (MockVsphereHelper)
     end
 
     describe "#provision" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec