From 5ef05e79dcee2130aaced0e23dc02f1ff1895a90 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 16 May 2019 09:02:13 -0600 Subject: [PATCH] Fixup oslo::messaging tests We shouldn't be checking the implementation of the oslo::messaging resources so this fixes it to check that we're passing the information correctly to the oslo::messaging resources Change-Id: Id320da57e2a0053439a1a70c37dece200dd780c8 --- spec/classes/magnum_init_spec.rb | 125 +++++++++++++++++++------------ 1 file changed, 77 insertions(+), 48 deletions(-) diff --git a/spec/classes/magnum_init_spec.rb b/spec/classes/magnum_init_spec.rb index 836456e..bcdbeaa 100644 --- a/spec/classes/magnum_init_spec.rb +++ b/spec/classes/magnum_init_spec.rb @@ -31,20 +31,26 @@ describe 'magnum' do end it 'configures rabbit' do - is_expected.to contain_magnum_config('DEFAULT/transport_url').with_value('') - is_expected.to contain_magnum_config('DEFAULT/rpc_response_timeout').with_value('') - is_expected.to contain_magnum_config('DEFAULT/control_exchange').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_rate').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/amqp_durable_queues').with_value('') + is_expected.to contain_oslo__messaging__rabbit('magnum_config').with( + :rabbit_ha_queues => '', + :heartbeat_timeout_threshold => '', + :heartbeat_rate => '', + :rabbit_use_ssl => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => '', + :kombu_ssl_version => '', + :kombu_ssl_keyfile => '', + :kombu_ssl_certfile => '', + :kombu_ssl_ca_certs => '', + :amqp_durable_queues => '', + :kombu_compression => '') end - it 'configures various things' do - is_expected.to contain_magnum_config('oslo_messaging_notifications/transport_url').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_notifications/driver').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_notifications/topics').with_value('') + it 'configures notifications' do + is_expected.to contain_oslo__messaging__notifications('magnum_config').with( + :transport_url => '', + :driver => '', + :topics => '') end end @@ -75,20 +81,31 @@ describe 'magnum' do end it 'configures rabbit' do - is_expected.to contain_magnum_config('DEFAULT/transport_url').with_value('rabbit://user:pass@host:1234/virt') - is_expected.to contain_magnum_config('DEFAULT/rpc_response_timeout').with_value('120') - is_expected.to contain_magnum_config('DEFAULT/control_exchange').with_value('magnum') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('shuffle') - is_expected.to contain_magnum_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true) - is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value(60) - is_expected.to contain_magnum_config('oslo_messaging_rabbit/heartbeat_rate').with_value(10) - is_expected.to contain_magnum_config('oslo_messaging_rabbit/amqp_durable_queues').with_value(true) + is_expected.to contain_oslo__messaging__default('magnum_config').with( + :transport_url => 'rabbit://user:pass@host:1234/virt', + :rpc_response_timeout => '120', + :control_exchange => 'magnum', + ) + is_expected.to contain_oslo__messaging__rabbit('magnum_config').with( + :rabbit_ha_queues => true, + :heartbeat_timeout_threshold => 60, + :heartbeat_rate => 10, + :rabbit_use_ssl => '', + :kombu_reconnect_delay => '', + :kombu_failover_strategy => 'shuffle', + :kombu_ssl_version => '', + :kombu_ssl_keyfile => '', + :kombu_ssl_certfile => '', + :kombu_ssl_ca_certs => '', + :amqp_durable_queues => true, + :kombu_compression => '') end - it 'configures various things' do - is_expected.to contain_magnum_config('oslo_messaging_notifications/transport_url').with_value('rabbit://user:pass@host:1234/virt') - is_expected.to contain_magnum_config('oslo_messaging_notifications/driver').with_value('messagingv1') - is_expected.to contain_magnum_config('oslo_messaging_notifications/topics').with_value('openstack') + it 'configures notifications' do + is_expected.to contain_oslo__messaging__notifications('magnum_config').with( + :transport_url => 'rabbit://user:pass@host:1234/virt', + :driver => 'messagingv1', + :topics => 'openstack') end end @@ -151,22 +168,23 @@ describe 'magnum' do end context 'with default amqp parameters' do it 'configures amqp' do - is_expected.to contain_magnum_config('oslo_messaging_amqp/server_request_prefix').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/broadcast_prefix').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/group_request_prefix').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/container_name').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/idle_timeout').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/trace').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_ca_file').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_cert_file').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_key_file').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_key_password').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/allow_insecure_clients').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/sasl_mechanisms').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/sasl_config_dir').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/sasl_config_name').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/username').with_value('') - is_expected.to contain_magnum_config('oslo_messaging_amqp/password').with_value('') + is_expected.to contain_oslo__messaging__amqp('magnum_config').with( + :server_request_prefix => '', + :broadcast_prefix => '', + :group_request_prefix => '', + :container_name => '', + :idle_timeout => '', + :trace => '', + :ssl_ca_file => '', + :ssl_cert_file => '', + :ssl_key_file => '', + :ssl_key_password => '', + :allow_insecure_clients => '', + :sasl_mechanisms => '', + :sasl_config_dir => '', + :sasl_config_name => '', + :username => '', + :password => '') end end @@ -184,14 +202,25 @@ describe 'magnum' do end it 'configures amqp' do - is_expected.to contain_magnum_config('DEFAULT/transport_url').with_value('amqp://amqp_user:password@localhost:5672') - is_expected.to contain_magnum_config('oslo_messaging_amqp/idle_timeout').with_value('60') - is_expected.to contain_magnum_config('oslo_messaging_amqp/trace').with_value('true') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_ca_file').with_value('/etc/ca.cert') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_cert_file').with_value('/etc/certfile') - is_expected.to contain_magnum_config('oslo_messaging_amqp/ssl_key_file').with_value('/etc/key') - is_expected.to contain_magnum_config('oslo_messaging_amqp/username').with_value('amqp_user') - is_expected.to contain_magnum_config('oslo_messaging_amqp/password').with_value('password') + is_expected.to contain_oslo__messaging__amqp('magnum_config').with( + :server_request_prefix => '', + :broadcast_prefix => '', + :group_request_prefix => '', + :container_name => '', + :idle_timeout => 60, + :trace => 'true', + :ssl_ca_file => '/etc/ca.cert', + :ssl_cert_file => '/etc/certfile', + :ssl_key_file => '/etc/key', + :ssl_key_password => '', + :allow_insecure_clients => '', + :sasl_mechanisms => '', + :sasl_config_dir => '', + :sasl_config_name => '', + :username => 'amqp_user', + :password => 'password') + is_expected.to contain_oslo__messaging__default('magnum_config').with( + :transport_url => 'amqp://amqp_user:password@localhost:5672') end end end