Skip to content

(MAINT) Remove find_pool and update pending tests #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junebug-spencer merged 1 commit into from
Jul 16, 2018
Merged

(MAINT) Remove find_pool and update pending tests #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions lib/vmpooler/providers/vsphere.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,27 +756,6 @@ def find_least_used_vpshere_compatible_host(vm)
[target_host, target_host.name]
end

def find_pool(poolname, connection, datacentername)
datacenter = connection.serviceInstance.find_datacenter(datacentername)
raise("Datacenter #{datacentername} does not exist") if datacenter.nil?
base = datacenter.hostFolder
pools = poolname.split('/')
pools.each do |pool|
if base.is_a?(RbVmomi::VIM::Folder)
base = base.childEntity.find { |f| f.name == pool }
elsif base.is_a?(RbVmomi::VIM::ClusterComputeResource)
base = base.resourcePool.resourcePool.find { |f| f.name == pool }
elsif base.is_a?(RbVmomi::VIM::ResourcePool)
base = base.resourcePool.find { |f| f.name == pool }
else
raise("Unexpected object type encountered (#{base.class}) while finding resource pool")
end
end

base = base.resourcePool unless base.is_a?(RbVmomi::VIM::ResourcePool) && base.respond_to?(:resourcePool)
base
end

def find_snapshot(vm, snapshotname)
get_snapshot_list(vm.snapshot.rootSnapshotList, snapshotname) if vm.snapshot
end
Expand Down
258 changes: 2 additions & 256 deletions spec/unit/providers/vsphere_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,14 +858,13 @@
end

it 'should honor the insecure setting' do
pending('Resolution of issue https://github.com/puppetlabs/vmpooler/issues/207')
config[:providers][:vsphere][:insecure] = false
config[:providers][:vsphere][:insecure] = true

expect(RbVmomi::VIM).to receive(:connect).with({
:host => credentials['server'],
:user => credentials['username'],
:password => credentials['password'],
:insecure => false,
:insecure => true,
}).and_return(connection)
subject.connect_to_vsphere
end
Expand Down Expand Up @@ -1527,17 +1526,6 @@
end
end

context 'with a VM with the same name as a folder in a single layer folder hierarchy' do

it 'should not return a VM' do
pending('https://github.com/puppetlabs/vmpooler/issues/204')
result = subject.find_vm_folder(foldername,connection,datacenter_name)
expect(result).to_not be_nil
expect(result.name).to eq(foldername)
expect(result.is_a? RbVmomi::VIM::VirtualMachine).to be false
end
end

context 'with a multi layer folder hierarchy' do
let(:foldername) { 'folder2/folder4/folder' }
let(:folder_object) { mock_RbVmomi_VIM_Folder({ :name => foldername}) }
Expand Down Expand Up @@ -2908,248 +2896,6 @@
end
end

describe '#find_pool' do
let(:poolname) { 'pool'}
let(:missing_poolname) { 'missing_pool'}

context 'with empty folder hierarchy' do
let(:connection_options) {{
:serviceContent => {
:datacenters => [
{ :name => datacenter_name }
]
}
}}

it 'should ensure the connection' do
pending('https://github.com/puppetlabs/vmpooler/issues/209')
expect(subject).to receive(:ensure_connected)

subject.find_pool(poolname,connection,datacenter_name)
end

it 'should return nil if the pool is not found' do
pending('https://github.com/puppetlabs/vmpooler/issues/209')
expect(subject.find_pool(missing_poolname,connection,datacenter_name)).to be_nil
end
end

context 'with multiple datacenters' do
let(:poolpath) { 'pool' }
let(:connection_options) {{
:serviceContent => {
:datacenters => [
{ :name => 'AnotherDC',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => nil,
},
},
{ :name => datacenter_name,
:hostfolder_tree => {
'folder3' => nil,
'pool' => {:object_type => 'resource_pool'},
'folder4' => nil,
},
}
]
}
}}

it 'should return the pool when found' do
result = subject.find_pool(poolpath,connection, datacenter_name)

expect(result).to_not be_nil
expect(result.name).to eq('pool')
expect(result.is_a?(RbVmomi::VIM::ResourcePool)).to be true
end
end

[
# Single layer Host folder hierarchy
{
:context => 'single layer folder hierarchy with a resource pool',
:poolpath => 'pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => nil,
'pool' => {:object_type => 'resource_pool'},
'folder3' => nil,
},
},
{
:context => 'single layer folder hierarchy with a child resource pool',
:poolpath => 'parentpool/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => nil,
'parentpool' => {:object_type => 'resource_pool', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
'folder3' => nil,
},
},
{
:context => 'single layer folder hierarchy with a resource pool within a cluster',
:poolpath => 'cluster/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => nil,
'cluster' => {:object_type => 'cluster_compute_resource', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
'folder3' => nil,
},
},
# Multi layer Host folder hierarchy
{
:context => 'multi layer folder hierarchy with a resource pool',
:poolpath => 'folder2/folder4/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => { :children => {
'folder3' => nil,
'folder4' => { :children => {
'pool' => {:object_type => 'resource_pool'},
}},
}},
'folder5' => nil,
},
},
{
:context => 'multi layer folder hierarchy with a child resource pool',
:poolpath => 'folder2/folder4/parentpool/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => { :children => {
'folder3' => nil,
'folder4' => { :children => {
'parentpool' => {:object_type => 'resource_pool', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
}},
}},
'folder5' => nil,
},
},
{
:context => 'multi layer folder hierarchy with a resource pool within a cluster',
:poolpath => 'folder2/folder4/cluster/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => { :children => {
'folder3' => nil,
'folder4' => { :children => {
'cluster' => {:object_type => 'cluster_compute_resource', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
}},
}},
'folder5' => nil,
},
},
].each do |testcase|
context testcase[:context] do
let(:connection_options) {{
:serviceContent => {
:datacenters => [
{ :name => datacenter_name,
:hostfolder_tree => testcase[:hostfolder_tree],
}
]
}
}}

it 'should return the pool when found' do
result = subject.find_pool(testcase[:poolpath],connection,datacenter_name)

expect(result).to_not be_nil
expect(result.name).to eq(testcase[:poolname])
expect(result.is_a?(RbVmomi::VIM::ResourcePool)).to be true
end

it 'should return nil if the poolname is not found' do
pending('https://github.com/puppetlabs/vmpooler/issues/209')
expect(subject.find_pool(missing_poolname,connection,datacenter_name)).to be_nil
end
end
end

# Tests for issue https://github.com/puppetlabs/vmpooler/issues/210
[
{
:context => 'multi layer folder hierarchy with a resource pool the same name as a folder',
:poolpath => 'folder2/folder4/cluster/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => { :children => {
'folder3' => nil,
'bad_pool' => {:object_type => 'resource_pool', :name => 'folder4'},
'folder4' => { :children => {
'cluster' => {:object_type => 'cluster_compute_resource', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
}},
}},
'folder5' => nil,
},
},
{
:context => 'multi layer folder hierarchy with a cluster the same name as a folder',
:poolpath => 'folder2/folder4/cluster/pool',
:poolname => 'pool',
:hostfolder_tree => {
'folder1' => nil,
'folder2' => { :children => {
'folder3' => nil,
'bad_cluster' => {:object_type => 'cluster_compute_resource', :name => 'folder4'},
'folder4' => { :children => {
'cluster' => {:object_type => 'cluster_compute_resource', :children => {
'pool' => {:object_type => 'resource_pool'},
}},
}},
}},
'folder5' => nil,
},
},
].each do |testcase|
context testcase[:context] do
let(:connection_options) {{
:serviceContent => {
:datacenters => [
{ :name => datacenter_name,
:hostfolder_tree => testcase[:hostfolder_tree],
}
]
}
}}

it 'should ensure the connection' do
pending('https://github.com/puppetlabs/vmpooler/issues/210')
expect(subject).to receive(:ensure_connected)

subject.find_pool(testcase[:poolpath],connection,datacenter_name)
end

it 'should return the pool when found' do
pending('https://github.com/puppetlabs/vmpooler/issues/210')
result = subject.find_pool(testcase[:poolpath],connection,datacenter_name)

expect(result).to_not be_nil
expect(result.name).to eq(testcase[:poolname])
expect(result.is_a?(RbVmomi::VIM::ResourcePool)).to be true
end
end
end
end

describe '#find_snapshot' do
let(:snapshot_name) {'snapshot'}
let(:missing_snapshot_name) {'missing_snapshot'}
Expand Down