openstack/puppet-cinder
Code Issues Proposed changes

Improve cinder_type properties regex

Browse Source 
This changes the regex for properties managed with
the cinder_type resource so that it supports the
format Cinder needs for multiattach and similar.

  multiattach=<is> True

This patch is needed so that cinder_type resources
can set the above.

See regex testing here [1]. Needs to be backported
to older versions so that cinder_type can be
properly used there as well.

[1] https://regexr.com/5imqk

Change-Id: If08fce9443281e65636aaaa99e3139732435f6f7
This commit is contained in:
Tobias Urdin 2020-12-17 09:59:02 +01:00
parent 930d112c8e
commit a032bec7d6
2 changed files with 4 additions and 4 deletions
lib/puppet/type
cinder_type.rb
spec/unit/provider/cinder_type
openstack_spec.rb

2
lib/puppet/type/cinder_type.rb

@ -16,7 +16,7 @@ Puppet::Type.newtype(:cinder_type) do
is.sort == should.sort is.sort == should.sort
end end
validate do |value| validate do |value|
raise ArgumentError, "Properties doesn't match" unless value.match(/^\s*[^=\s]+=[^=\s]+$/) raise ArgumentError, "Properties doesn't match" unless value.match(/^\s*[^=\s]+=\S(([^=,])+((?<=\S),(?=\S))?)+([^\s=,])+$/)
end end
end end

6
spec/unit/provider/cinder_type/openstack_spec.rb

@ -16,7 +16,7 @@ describe provider_class do
{ {
:name => 'Backend_1', :name => 'Backend_1',
:ensure => :present, :ensure => :present,
:properties => ['key=value', 'new_key=new_value'], :properties => ['key=value', 'new_key=new_value', 'multiattach="<is> True"'],
:is_public => true, :is_public => true,
:access_project_ids => [], :access_project_ids => [],
} }
@ -41,10 +41,10 @@ describe provider_class do
describe '#create' do describe '#create' do
it 'creates a type' do it 'creates a type' do
provider_class.expects(:openstack) provider_class.expects(:openstack)
.with('volume type', 'create', '--format', 'shell', ['--property', 'key=value', '--property', 'new_key=new_value', '--public', 'Backend_1']) .with('volume type', 'create', '--format', 'shell', ['--property', 'key=value', '--property', 'new_key=new_value', '--property', 'multiattach="<is> True"', '--public', 'Backend_1'])
.returns('id="90e19aff-1b35-4d60-9ee3-383c530275ab" .returns('id="90e19aff-1b35-4d60-9ee3-383c530275ab"
name="Backend_1" name="Backend_1"
properties="key=\'value\', new_key=\'new_value\'" properties="key=\'value\', new_key=\'new_value\', multiattach=\'<is> True\'"
is_public="True" is_public="True"
access_project_ids="" access_project_ids=""
') ')