openstack/puppet-neutron
Code Issues Proposed changes

Accept a string and hash for contrail_extensions

Browse Source 
... following the logic we have for DictOpt options.

Change-Id: I20204bc6c63336d2e04d3e19a058e8b2f23b0778
This commit is contained in:
Takashi Kajinami 2023-07-25 23:24:04 +09:00
parent dbad032e33
commit d70cabeb52
2 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/plugins/opencontrail.pp
View File

@ -49,7 +49,10 @@ class neutron::plugins::opencontrail (
include neutron::deps include neutron::deps
include neutron::params include neutron::params
validate_legacy(Array, 'validate_array', $contrail_extensions) $contrail_extensions_real = $contrail_extensions ? {
Hash => join(join_keys_to_values($contrail_extensions, ':'), ','),
default => join(any2array($contrail_extensions), ','),
}
package { 'neutron-plugin-contrail': package { 'neutron-plugin-contrail':
ensure => $package_ensure, ensure => $package_ensure,
@ -89,7 +92,7 @@ class neutron::plugins::opencontrail (
neutron_plugin_opencontrail { neutron_plugin_opencontrail {
'APISERVER/api_server_ip': value => $api_server_ip; 'APISERVER/api_server_ip': value => $api_server_ip;
'APISERVER/api_server_port': value => $api_server_port; 'APISERVER/api_server_port': value => $api_server_port;
'APISERVER/contrail_extensions': value => join($contrail_extensions, ','); 'APISERVER/contrail_extensions': value => $contrail_extensions_real;
'APISERVER/timeout': value => $timeout; 'APISERVER/timeout': value => $timeout;
'APISERVER/connection_timeout': value => $connection_timeout; 'APISERVER/connection_timeout': value => $connection_timeout;
} }

76
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@ -2,37 +2,61 @@ require 'spec_helper'
describe 'neutron::plugins::opencontrail' do describe 'neutron::plugins::opencontrail' do
shared_examples 'neutron::plugins::contrail' do shared_examples 'neutron::plugins::contrail' do
let :params do
{ context 'with defaults' do
:api_server_ip => '10.0.0.1', it 'passes purge to resource' do
:api_server_port => '8082', should contain_resources('neutron_plugin_opencontrail').with({
:contrail_extensions => ['ipam:ipam','policy:policy','route-table'], :purge => false
:purge_config => false, })
} end
it 'should perform default configuration of' do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_ip').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_opencontrail('APISERVER/api_server_port').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_opencontrail('APISERVER/timeout').with_value('<SERVICE DEFAULT>')
should contain_neutron_plugin_opencontrail('APISERVER/connection_timeout').with_value('<SERVICE DEFAULT>')
end
end end
it 'passes purge to resource' do context 'with parameters' do
should contain_resources('neutron_plugin_opencontrail').with({ let :params do
:purge => false {
}) :api_server_ip => '10.0.0.1',
:api_server_port => '8082',
:contrail_extensions => ['ipam:ipam','policy:policy','route-table'],
:timeout => 10,
:connection_timeout => 5,
}
end
it 'should set the given values' do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_ip').with_value(params[:api_server_ip])
should contain_neutron_plugin_opencontrail('APISERVER/api_server_port').with_value(params[:api_server_port])
should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value(params[:contrail_extensions].join(','))
should contain_neutron_plugin_opencontrail('APISERVER/timeout').with_value(params[:timeout])
should contain_neutron_plugin_opencontrail('APISERVER/connection_timeout').with_value(params[:connection_timeout])
end
end end
it 'should perform default configuration of' do context 'contrail_extensions set by a dictionary' do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_ip').with_value(params[:api_server_ip]) let :params do
should contain_neutron_plugin_opencontrail('APISERVER/api_server_port').with_value(params[:api_server_port]) {
should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value(params[:contrail_extensions].join(',')) :contrail_extensions => {
should contain_neutron_plugin_opencontrail('APISERVER/timeout').with_value('<SERVICE DEFAULT>') 'ipam' => 'ipam',
should contain_neutron_plugin_opencontrail('APISERVER/connection_timeout').with_value('<SERVICE DEFAULT>') 'policy' => 'policy',
'route-table' => 'route-table',
}
}
end
it 'should configure the contrail_extensions' do
should contain_neutron_plugin_opencontrail('APISERVER/contrail_extensions').with_value('ipam:ipam,policy:policy,route-table:route-table')
end
end end
end end
shared_examples 'neutron::plugins::opencontrail on Debian' do shared_examples 'neutron::plugins::opencontrail on Debian' do
let :params do
{
:contrail_extensions => ['ipam:ipam','policy:policy','route-table']
}
end
it 'configures /etc/default/neutron-server' do it 'configures /etc/default/neutron-server' do
should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with( should contain_file_line('/etc/default/neutron-server:NEUTRON_PLUGIN_CONFIG').with(
:path => '/etc/default/neutron-server', :path => '/etc/default/neutron-server',
@ -46,12 +70,6 @@ describe 'neutron::plugins::opencontrail' do
end end
shared_examples 'neutron::plugins::opencontrail on RedHat' do shared_examples 'neutron::plugins::opencontrail on RedHat' do
let :params do
{
:contrail_extensions => ['ipam:ipam','policy:policy','route-table']
}
end
it 'should create plugin symbolic link' do it 'should create plugin symbolic link' do
should contain_file('/etc/neutron/plugin.ini').with( should contain_file('/etc/neutron/plugin.ini').with(
:ensure => 'link', :ensure => 'link',