puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 01:58:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #224 from glennsarti/gh-213-remove-underscore-connection

Browse source 
(GH-213) Remove use of private _connection method
This commit is contained in:
Rob Braden 2017-06-20 15:11:02 -07:00 • committed by GitHub
commit cfc1b61f0e
2 changed files with 1 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/vmpooler/providers/vsphere.rb
View file

@ -675,7 +675,7 @@ module Vmpooler
vmdk_datastore = find_datastore(datastore, connection)
vm_files = vmdk_datastore._connection.serviceContent.propertyCollector.collectMultiple vmdk_datastore.vm, 'layoutEx.file'
vm_files = connection.serviceContent.propertyCollector.collectMultiple vmdk_datastore.vm, 'layoutEx.file'
vm_files.keys.each do |f|
vm_files[f]['layoutEx.file'].each do |l|
if l.name =~ /^\[#{vmdk_datastore.name}\] #{vmname}\/#{vmname}_([0-9]+).vmdk/

21
spec/unit/providers/vsphere_spec.rb
View file

@ -1236,11 +1236,6 @@ EOT
let(:reconfig_vm_task) { mock_RbVmomi_VIM_Task() }
before(:each) do
# NOTE - This method should not be using `_connection`, instead it should be using `@conection`
# This should not be required once https://github.com/puppetlabs/vmpooler/issues/213 is resolved
mock_ds = subject.find_datastore(datastorename,connection)
allow(mock_ds).to receive(:_connection).and_return(connection) unless mock_ds.nil?
# Mocking for find_vmdks
allow(connection.serviceContent.propertyCollector).to receive(:collectMultiple).and_return(collectMultiple_response)
@ -2701,25 +2696,9 @@ EOT
let(:collectMultiple_response) { {} }
before(:each) do
# NOTE - This method should not be using `_connection`, instead it should be using `@conection`
mock_ds = subject.find_datastore(datastorename,connection)
allow(mock_ds).to receive(:_connection).and_return(connection)
allow(connection.serviceContent.propertyCollector).to receive(:collectMultiple).and_return(collectMultiple_response)
end
it 'should not use _connction to get the underlying connection object' do
pending('https://github.com/puppetlabs/vmpooler/issues/213')
mock_ds = subject.find_datastore(datastorename)
expect(mock_ds).to receive(:_connection).exactly(0).times
begin
# ignore all errors. What's important is that it doesn't call _connection
subject.find_vmdks(vmname,datastorename,connection)
rescue
end
end
context 'Searching all files for all VMs on a Datastore' do
# This is fairly fragile mocking
let(:collectMultiple_response) { {