Add support for MultiStrOpt (inspector)

This replaces the provider implementation of ironic_inspector_config
type so that MultiStrOpt, which is used by several options like
 - oslo_policy/policy_dirs
are handled correctly.

The same was already implemented for ironic_config by [1].

[1] 0f4a5263a7

Change-Id: If032600c34394f9f0f3686971082aafeab9be3ea
This commit is contained in:
Takashi Kajinami 2021-11-02 09:05:25 +09:00
parent 889fc86298
commit ecdeb8f365
4 changed files with 66 additions and 13 deletions

View File

@ -1,6 +1,6 @@
Puppet::Type.type(:ironic_inspector_config).provide(
:ini_setting,
:parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
:openstackconfig,
:parent => Puppet::Type.type(:openstack_config).provider(:ruby)
) do
def self.file_path

View File

@ -7,14 +7,22 @@ Puppet::Type.newtype(:ironic_inspector_config) do
newvalues(/\S+\/\S+/)
end
newproperty(:value) do
newproperty(:value, :array_matching => :all) do
desc 'The value of the setting to be defined.'
def insync?(is)
return true if @should.empty?
return false unless is.is_a? Array
return false unless is.length == @should.length
return (
is & @should == is or
is & @should.map(&:to_s) == is
)
end
munge do |value|
value = value.to_s.strip
value.capitalize! if value =~ /^(true|false)$/i
value
end
newvalues(/^[\S ]*$/)
def is_to_s( currentvalue )
if resource.secret?

View File

@ -1,3 +1,8 @@
#
# these tests are a little concerning b/c they are hacking around the
# modulepath, so these tests will not catch issues that may eventually arise
# related to loading these plugins.
# I could not, for the life of me, figure out how to programmatically set the modulepath
$LOAD_PATH.push(
File.join(
File.dirname(__FILE__),
@ -23,16 +28,13 @@ $LOAD_PATH.push(
require 'spec_helper'
provider_class = Puppet::Type.type(:ironic_inspector_config).provider(:ini_setting)
provider_class = Puppet::Type.type(:ironic_inspector_config).provider(:openstackconfig)
describe provider_class do
it 'should default to the default setting when no other one is specified' do
resource = Puppet::Type::Ironic_inspector_config.new(
{
:name => 'DEFAULT/foo',
:value => 'bar'
}
{:name => 'DEFAULT/foo', :value => 'bar'}
)
provider = provider_class.new(resource)
expect(provider.section).to eq('DEFAULT')
@ -41,10 +43,7 @@ describe provider_class do
it 'should allow setting to be set explicitly' do
resource = Puppet::Type::Ironic_inspector_config.new(
{
:name => 'dude/foo',
:value => 'bar'
}
{:name => 'dude/foo', :value => 'bar'}
)
provider = provider_class.new(resource)
expect(provider.section).to eq('dude')
@ -68,4 +67,5 @@ describe provider_class do
provider.exists?
expect(resource[:ensure]).to eq :absent
end
end

View File

@ -6,6 +6,51 @@ describe 'Puppet::Type.type(:ironic_inspector_config)' do
@ironic_inspector_config = Puppet::Type.type(:ironic_inspector_config).new(:name => 'DEFAULT/foo', :value => 'bar')
end
it 'should require a name' do
expect {
Puppet::Type.type(:ironic_inspector_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(:ironic_inspector_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(:ironic_inspector_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(:ironic_inspector_config).new(:name => 'DEFAULT/foo', :ensure => :absent)
end
it 'should accept a valid value' do
@ironic_inspector_config[:value] = 'bar'
expect(@ironic_inspector_config[:value]).to eq(['bar'])
end
it 'should not accept a value with whitespace' do
@ironic_inspector_config[:value] = 'b ar'
expect(@ironic_inspector_config[:value]).to eq(['b ar'])
end
it 'should accept valid ensure values' do
@ironic_inspector_config[:ensure] = :present
expect(@ironic_inspector_config[:ensure]).to eq(:present)
@ironic_inspector_config[:ensure] = :absent
expect(@ironic_inspector_config[:ensure]).to eq(:absent)
end
it 'should not accept invalid ensure values' do
expect {
@ironic_inspector_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 => 'ironic::install::end')