Use anchor to require necessary packages
... so that correct packages are required without re-defining them in resource implementations. Change-Id: I30a506cd329c5764f695ef823b6a9b61208e2580
This commit is contained in:
parent
16f227ed86
commit
012eb0ec2e
|
@ -62,12 +62,8 @@ Puppet::Type.newtype(:barbican_api_paste_ini) do
|
||||||
defaultto('<SERVICE DEFAULT>')
|
defaultto('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
autorequire(:package) do
|
autorequire(:anchor) do
|
||||||
if Facter.value(:osfamily) == 'Debian'
|
['barbican::install::end']
|
||||||
'barbican-api'
|
|
||||||
elsif Facter.value(:osfamily) == 'RedHat'
|
|
||||||
'openstack-barbican-api'
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -73,8 +73,8 @@ Puppet::Type.newtype(:barbican_config) do
|
||||||
defaultto('<SERVICE DEFAULT>')
|
defaultto('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
|
|
||||||
autorequire(:package) do
|
autorequire(:anchor) do
|
||||||
'barbican'
|
['barbican::install::end']
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -22,76 +22,22 @@ require 'puppet/type/barbican_api_paste_ini'
|
||||||
|
|
||||||
describe 'Puppet::Type.type(:barbican_api_paste_ini)' do
|
describe 'Puppet::Type.type(:barbican_api_paste_ini)' do
|
||||||
before :each do
|
before :each do
|
||||||
Puppet::Type.rmtype(:barbican_api_paste_ini)
|
|
||||||
Facter.fact(:osfamily).stubs(:value).returns(platform_params[:osfamily])
|
|
||||||
@barbican_api_paste_ini = Puppet::Type.type(:barbican_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
|
@barbican_api_paste_ini = Puppet::Type.type(:barbican_api_paste_ini).new(:name => 'DEFAULT/foo', :value => 'bar')
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples_for 'barbican_api_paste_ini' do
|
it 'should accept a valid value' do
|
||||||
|
@barbican_api_paste_ini[:value] = 'bar'
|
||||||
it 'should require a name' do
|
expect(@barbican_api_paste_ini[:value]).to eq('bar')
|
||||||
expect {
|
|
||||||
Puppet::Type.type(:barbican_api_paste_ini).new({})
|
|
||||||
}.to raise_error(Puppet::Error, 'Title or name must be provided')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should not expect a name with whitespace' do
|
|
||||||
expect {
|
|
||||||
Puppet::Type.type(:barbican_api_paste_ini).new(:name => 'f oo')
|
|
||||||
}.to raise_error(Puppet::Error, /Parameter name failed/)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should fail when there is no section' do
|
|
||||||
expect {
|
|
||||||
Puppet::Type.type(:barbican_api_paste_ini).new(:name => 'foo')
|
|
||||||
}.to raise_error(Puppet::Error, /Parameter name failed/)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should not require a value when ensure is absent' do
|
|
||||||
Puppet::Type.type(:barbican_api_paste_ini).new(:name => 'DEFAULT/foo', :ensure => :absent)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should accept a valid value' do
|
|
||||||
@barbican_api_paste_ini[:value] = 'bar'
|
|
||||||
expect(@barbican_api_paste_ini[:value]).to eq('bar')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should not accept a value with whitespace' do
|
|
||||||
@barbican_api_paste_ini[:value] = 'b ar'
|
|
||||||
expect(@barbican_api_paste_ini[:value]).to eq('b ar')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should accept valid ensure values' do
|
|
||||||
@barbican_api_paste_ini[:ensure] = :present
|
|
||||||
expect(@barbican_api_paste_ini[:ensure]).to eq(:present)
|
|
||||||
@barbican_api_paste_ini[:ensure] = :absent
|
|
||||||
expect(@barbican_api_paste_ini[:ensure]).to eq(:absent)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should not accept invalid ensure values' do
|
|
||||||
expect {
|
|
||||||
@barbican_api_paste_ini[:ensure] = :latest
|
|
||||||
}.to raise_error(Puppet::Error, /Invalid value/)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should autorequire the package that install the file' do
|
|
||||||
catalog = Puppet::Resource::Catalog.new
|
|
||||||
package = Puppet::Type.type(:package).new(:name => platform_params[:package_name])
|
|
||||||
catalog.add_resource package, @barbican_api_paste_ini
|
|
||||||
dependency = @barbican_api_paste_ini.autorequire
|
|
||||||
expect(dependency.size).to eq(1)
|
|
||||||
expect(dependency[0].target).to eq(@barbican_api_paste_ini)
|
|
||||||
expect(dependency[0].source).to eq(package)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'on RedHat platforms' do
|
it 'should autorequire the package that install the file' do
|
||||||
let :platform_params do
|
catalog = Puppet::Resource::Catalog.new
|
||||||
{ :package_name => 'openstack-barbican-api',
|
anchor = Puppet::Type.type(:anchor).new(:name => 'barbican::install::end')
|
||||||
:osfamily => 'RedHat'}
|
catalog.add_resource anchor, @barbican_api_paste_ini
|
||||||
end
|
dependency = @barbican_api_paste_ini.autorequire
|
||||||
|
expect(dependency.size).to eq(1)
|
||||||
it_behaves_like 'barbican_api_paste_ini'
|
expect(dependency[0].target).to eq(@barbican_api_paste_ini)
|
||||||
|
expect(dependency[0].source).to eq(anchor)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
require 'puppet'
|
||||||
|
require 'puppet/type/barbican_config'
|
||||||
|
|
||||||
|
describe 'Puppet::Type.type(:barbican_config)' do
|
||||||
|
before :each do
|
||||||
|
@barbican_config = Puppet::Type.type(:barbican_config).new(:name => 'DEFAULT/foo', :value => 'bar')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should require a name' do
|
||||||
|
expect {
|
||||||
|
Puppet::Type.type(:barbican_config).new({})
|
||||||
|
}.to raise_error(Puppet::Error, 'Title or name must be provided')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should not expect a name with whitespace' do
|
||||||
|
expect {
|
||||||
|
Puppet::Type.type(:barbican_config).new(:name => 'f oo')
|
||||||
|
}.to raise_error(Puppet::Error, /Parameter name failed/)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should fail when there is no section' do
|
||||||
|
expect {
|
||||||
|
Puppet::Type.type(:barbican_config).new(:name => 'foo')
|
||||||
|
}.to raise_error(Puppet::Error, /Parameter name failed/)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should not require a value when ensure is absent' do
|
||||||
|
Puppet::Type.type(:barbican_config).new(:name => 'DEFAULT/foo', :ensure => :absent)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should accept a valid value' do
|
||||||
|
@barbican_config[:value] = 'bar'
|
||||||
|
expect(@barbican_config[:value]).to eq(['bar'])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should not accept a value with whitespace' do
|
||||||
|
@barbican_config[:value] = 'b ar'
|
||||||
|
expect(@barbican_config[:value]).to eq(['b ar'])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should accept valid ensure values' do
|
||||||
|
@barbican_config[:ensure] = :present
|
||||||
|
expect(@barbican_config[:ensure]).to eq(:present)
|
||||||
|
@barbican_config[:ensure] = :absent
|
||||||
|
expect(@barbican_config[:ensure]).to eq(:absent)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should not accept invalid ensure values' do
|
||||||
|
expect {
|
||||||
|
@barbican_config[:ensure] = :latest
|
||||||
|
}.to raise_error(Puppet::Error, /Invalid value/)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should autorequire the package that install the file' do
|
||||||
|
catalog = Puppet::Resource::Catalog.new
|
||||||
|
anchor = Puppet::Type.type(:anchor).new(:name => 'barbican::install::end')
|
||||||
|
catalog.add_resource anchor, @barbican_config
|
||||||
|
dependency = @barbican_config.autorequire
|
||||||
|
expect(dependency.size).to eq(1)
|
||||||
|
expect(dependency[0].target).to eq(@barbican_config)
|
||||||
|
expect(dependency[0].source).to eq(anchor)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
Loading…
Reference in New Issue