From 453cc408784648c6092279159121250eeb62ccbe Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 21 Jan 2022 23:33:05 +0900 Subject: [PATCH] Avoid testing details of oslo::messaging(::*) ... so that any change in puppet-oslo would not directly break unit tests. Change-Id: I0579cd61806133d90b8214c7d671e6f651038d87 --- spec/classes/ceilometer_init_spec.rb | 180 ++++++++++++--------------- 1 file changed, 81 insertions(+), 99 deletions(-) diff --git a/spec/classes/ceilometer_init_spec.rb b/spec/classes/ceilometer_init_spec.rb index 430c345..611ce0f 100644 --- a/spec/classes/ceilometer_init_spec.rb +++ b/spec/classes/ceilometer_init_spec.rb @@ -13,12 +13,6 @@ describe 'ceilometer' do } end - let :rabbit_params do - { - :rabbit_qos_prefetch_count => 10, - } - end - shared_examples_for 'ceilometer' do it 'configures timeout for HTTP requests' do @@ -34,14 +28,13 @@ describe 'ceilometer' do end context 'with rabbit parameters' do - before { params.merge!( rabbit_params ) } it_configures 'a ceilometer base installation' it_configures 'rabbit with SSL support' - it_configures 'rabbit without HA support (with backward compatibility)' + it_configures 'rabbit without HA support' it_configures 'rabbit with connection heartbeats' context 'with rabbit_ha_queues' do - before { params.merge!( rabbit_params ).merge!( :rabbit_ha_queues => true ) } + before { params.merge!( :rabbit_ha_queues => true ) } it_configures 'rabbit with rabbit_ha_queues' end @@ -49,10 +42,9 @@ describe 'ceilometer' do context 'with rabbit parameters' do context 'with one server' do - before { params.merge!( rabbit_params ) } it_configures 'a ceilometer base installation' it_configures 'rabbit with SSL support' - it_configures 'rabbit without HA support (without backward compatibility)' + it_configures 'rabbit without HA support' end end @@ -110,16 +102,20 @@ describe 'ceilometer' do end it 'configures default transport_url' do - is_expected.to contain_ceilometer_config('DEFAULT/executor_thread_pool_size').with_value('') - is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('') - is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('') - is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('') + is_expected.to contain_oslo__messaging__default('ceilometer_config').with( + :executor_thread_pool_size => '', + :transport_url => '', + :rpc_response_timeout => '', + :control_exchange => '' + ) end it 'configures notifications' do - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/topics').with_value('notifications') - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/driver').with_value('') - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/transport_url').with_value('') + is_expected.to contain_oslo__messaging__notifications('ceilometer_config').with( + :transport_url => '', + :driver => '', + :topics => ['notifications'] + ) end it 'configures snmpd auth' do @@ -156,10 +152,12 @@ describe 'ceilometer' do } it 'configures transport_url' do - is_expected.to contain_ceilometer_config('DEFAULT/executor_thread_pool_size').with_value('128') - is_expected.to contain_ceilometer_config('DEFAULT/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') - is_expected.to contain_ceilometer_config('DEFAULT/rpc_response_timeout').with_value('120') - is_expected.to contain_ceilometer_config('DEFAULT/control_exchange').with_value('ceilometer') + is_expected.to contain_oslo__messaging__default('ceilometer_config').with( + :executor_thread_pool_size => '128', + :transport_url => 'rabbit://rabbit_user:password@localhost:5673', + :rpc_response_timeout => '120', + :control_exchange => 'ceilometer' + ) end end @@ -187,57 +185,53 @@ describe 'ceilometer' do before { params.merge!( :notification_topics => ['notifications', 'custom'], - :notification_driver => 'messagingv1', + :notification_driver => 'messagingv2', :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673', ) } it 'configures notifications' do - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/topics').with_value('notifications,custom') - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/driver').with_value('messagingv1') - is_expected.to contain_ceilometer_config('oslo_messaging_notifications/transport_url').with_value('rabbit://rabbit_user:password@localhost:5673') + is_expected.to contain_oslo__messaging__notifications('ceilometer_config').with( + :transport_url => 'rabbit://rabbit_user:password@localhost:5673', + :driver => 'messagingv2', + :topics => ['notifications', 'custom'] + ) end end end - shared_examples_for 'rabbit without HA support (with backward compatibility)' do + shared_examples_for 'rabbit without HA support' do it 'configures rabbit' do - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') - end - - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value( params[:rabbit_qos_prefetch_count] ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') } - - end - - shared_examples_for 'rabbit without HA support (without backward compatibility)' do - - it 'configures rabbit' do - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value('') + is_expected.to contain_oslo__messaging__rabbit('ceilometer_config').with( + :rabbit_ha_queues => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :heartbeat_in_pthread => '', + :rabbit_qos_prefetch_count => '', + :amqp_durable_queues => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => '', + :kombu_compression => '', + ) end - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_qos_prefetch_count').with_value( params[:rabbit_qos_prefetch_count] ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') } - end shared_examples_for 'rabbit with rabbit_ha_queues' do it 'configures rabbit' do - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value( params[:rabbit_ha_queues] ) + is_expected.to contain_oslo__messaging__rabbit('ceilometer_config').with( + :rabbit_ha_queues => params[:rabbit_ha_queues] + ) end end shared_examples_for 'rabbit with durable queues' do it 'in ceilometer' do - is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) + is_expected.to contain_oslo__messaging__rabbit('ceilometer_config').with( + :amqp_durable_queues => params[:amqp_durable_queues] + ) end end @@ -249,9 +243,11 @@ describe 'ceilometer' do :rabbit_heartbeat_in_pthread => true, ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('60') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_rate').with_value('10') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_rabbit/heartbeat_in_pthread').with_value(true) } + it { is_expected.to contain_oslo__messaging__rabbit('ceilometer_config').with( + :heartbeat_timeout_threshold => '60', + :heartbeat_rate => '10', + :heartbeat_in_pthread => true, + ) } end end @@ -293,42 +289,26 @@ describe 'ceilometer' do :rabbit_use_ssl => true, )} end - - context "with SSL wrongly configured" do - context 'with kombu_ssl_ca_certs parameter' do - before { params.merge!(:kombu_ssl_ca_certs => '/path/to/ca.crt') } - it_raises 'a Puppet::Error', /The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true/ - end - - context 'with kombu_ssl_certfile parameter' do - before { params.merge!(:kombu_ssl_certfile => '/path/to/ssl/cert/file') } - it_raises 'a Puppet::Error', /The kombu_ssl_certfile parameter requires rabbit_use_ssl to be set to true/ - end - - context 'with kombu_ssl_keyfile parameter' do - before { params.merge!(:kombu_ssl_keyfile => '/path/to/ssl/keyfile') } - it_raises 'a Puppet::Error', /The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true/ - end - end end shared_examples_for 'amqp support' do context 'with default parameters' do - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/server_request_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/broadcast_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/group_request_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/container_name').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/idle_timeout').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/trace').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_ca_file').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_cert_file').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_key_file').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_key_password').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_config_dir').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_config_name').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/username').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/password').with_value('') } + it { is_expected.to contain_oslo__messaging__amqp('ceilometer_config').with( + :server_request_prefix => '', + :broadcast_prefix => '', + :group_request_prefix => '', + :container_name => '', + :idle_timeout => '', + :trace => '', + :ssl_ca_file => '', + :ssl_cert_file => '', + :ssl_key_file => '', + :sasl_mechanisms => '', + :sasl_config_dir => '', + :sasl_config_name => '', + :username => '', + :password => '', + ) } end context 'with overridden amqp parameters' do @@ -342,20 +322,22 @@ describe 'ceilometer' do :amqp_password => 'password', ) } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/server_request_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/broadcast_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/group_request_prefix').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/container_name').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/idle_timeout').with_value('60') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/trace').with_value('true') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_ca_file').with_value('/path/to/ca.cert') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_cert_file').with_value('/path/to/certfile') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/ssl_key_file').with_value('/path/to/key') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_config_dir').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/sasl_config_name').with_value('') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/username').with_value('amqp_user') } - it { is_expected.to contain_ceilometer_config('oslo_messaging_amqp/password').with_value('password') } + it { is_expected.to contain_oslo__messaging__amqp('ceilometer_config').with( + :server_request_prefix => '', + :broadcast_prefix => '', + :group_request_prefix => '', + :container_name => '', + :idle_timeout => '60', + :trace => true, + :ssl_ca_file => '/path/to/ca.cert', + :ssl_cert_file => '/path/to/certfile', + :ssl_key_file => '/path/to/key', + :sasl_mechanisms => '', + :sasl_config_dir => '', + :sasl_config_name => '', + :username => 'amqp_user', + :password => 'password', + ) } end end -- 2.45.2