Browse Source

Revert "Do not test authtoken parameters directly"

This reverts commit 27d9afed0c.

Reason for revert:
This was merged in a wrong branch, and should be proposed to
master.

Change-Id: I3b624605bb7ca3db80454fc3dbef26e59b184352
changes/52/790852/1
Takashi Kajinami 1 month ago
parent
commit
5fc634d0cd
1 changed files with 74 additions and 76 deletions
  1. +74
    -76
      spec/classes/aodh_keystone_authtoken_spec.rb

+ 74
- 76
spec/classes/aodh_keystone_authtoken_spec.rb View File

@ -6,48 +6,45 @@ describe 'aodh::keystone::authtoken' do
{ :password => 'aodh_password', }
end
shared_examples 'aodh::keystone::authtoken' do
shared_examples 'aodh authtoken' do
context 'with default parameters' do
it 'configure keystone_authtoken' do
contain_keystone__resources__authtoken('aodh_config').with(
:username => 'aodh',
:password => 'aodh_password',
:auth_url => 'http://localhost:5000',
:project_name => 'services',
:user_domain_name => 'Default',
:project_domain_name => 'Default',
:insecure => '<SERVICE DEFAULT>',
:auth_section => '<SERVICE DEFAULT>',
:auth_type => 'password',
:www_authenticate_uri => 'http://localhost:5000',
:auth_version => '<SERVICE DEFAULT>',
:cache => '<SERVICE DEFAULT>',
:cafile => '<SERVICE DEFAULT>',
:certfile => '<SERVICE DEFAULT>',
:delay_auth_decision => '<SERVICE DEFAULT>',
:enforce_token_bind => '<SERVICE DEFAULT>',
:http_connect_timeout => '<SERVICE DEFAULT>',
:http_request_max_retries => '<SERVICE DEFAULT>',
:include_service_catalog => '<SERVICE DEFAULT>',
:keyfile => '<SERVICE DEFAULT>',
:memcache_pool_conn_get_timeout => '<SERVICE DEFAULT>',
:memcache_pool_dead_retry => '<SERVICE DEFAULT>',
:memcache_pool_maxsize => '<SERVICE DEFAULT>',
:memcache_pool_socket_timeout => '<SERVICE DEFAULT>',
:memcache_pool_unused_timeout => '<SERVICE DEFAULT>',
:memcache_secret_key => '<SERVICE DEFAULT>',
:memcache_security_strategy => '<SERVICE DEFAULT>',
:memcache_use_advanced_pool => '<SERVICE DEFAULT>',
:memcached_servers => '<SERVICE DEFAULT>',
:manage_memcache_package => false,
:region_name => '<SERVICE DEFAULT>',
:token_cache_time => '<SERVICE DEFAULT>',
:service_token_roles => '<SERVICE DEFAULT>',
:service_token_roles_required => '<SERVICE DEFAULT>',
:interface => '<SERVICE DEFAULT>',
)
is_expected.to contain_aodh_config('keystone_authtoken/username').with_value('aodh')
is_expected.to contain_aodh_config('keystone_authtoken/password').with_value('aodh_password')
is_expected.to contain_aodh_config('keystone_authtoken/auth_url').with_value('http://localhost:5000')
is_expected.to contain_aodh_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_aodh_config('keystone_authtoken/user_domain_name').with_value('Default')
is_expected.to contain_aodh_config('keystone_authtoken/project_domain_name').with_value('Default')
is_expected.to contain_aodh_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/auth_section').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/auth_type').with_value('password')
is_expected.to contain_aodh_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000')
is_expected.to contain_aodh_config('keystone_authtoken/auth_version').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/cache').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/cafile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/certfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/delay_auth_decision').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/enforce_token_bind').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/http_connect_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/http_request_max_retries').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/include_service_catalog').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/keyfile').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_dead_retry').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_maxsize').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_secret_key').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_security_strategy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_aodh_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -93,43 +90,44 @@ describe 'aodh::keystone::authtoken' do
end
it 'configure keystone_authtoken' do
contain_keystone__resources__authtoken('aodh_config').with(
:www_authenticate_uri => 'https://10.0.0.1:9999/',
:username => 'myuser',
:password => 'mypasswd',
:auth_url => 'http://:127.0.0.1:5000',
:project_name => 'service_project',
:user_domain_name => 'domainX',
:project_domain_name => 'domainX',
:insecure => false,
:auth_section => 'new_section',
:auth_type => 'password',
:auth_version => 'v3',
:cache => 'somevalue',
:cafile => '/opt/stack/data/cafile.pem',
:certfile => 'certfile.crt',
:delay_auth_decision => false,
:enforce_token_bind => 'permissive',
:http_connect_timeout => '300',
:http_request_max_retries => '3',
:include_service_catalog => true,
:keyfile => 'keyfile',
:memcache_pool_conn_get_timeout => '9',
:memcache_pool_dead_retry => '302',
:memcache_pool_maxsize => '11',
:memcache_pool_socket_timeout => '2',
:memcache_pool_unused_timeout => '61',
:memcache_secret_key => 'secret_key',
:memcache_security_strategy => 'ENCRYPT',
:memcache_use_advanced_pool => true,
:memcached_servers => ['memcached01:11211','memcached02:11211'],
:manage_memcache_package => true,
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => false,
:interface => 'internal',
)
is_expected.to contain_aodh_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/')
is_expected.to contain_aodh_config('keystone_authtoken/username').with_value(params[:username])
is_expected.to contain_aodh_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
is_expected.to contain_aodh_config('keystone_authtoken/auth_url').with_value(params[:auth_url])
is_expected.to contain_aodh_config('keystone_authtoken/project_name').with_value(params[:project_name])
is_expected.to contain_aodh_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
is_expected.to contain_aodh_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name])
is_expected.to contain_aodh_config('keystone_authtoken/insecure').with_value(params[:insecure])
is_expected.to contain_aodh_config('keystone_authtoken/auth_section').with_value(params[:auth_section])
is_expected.to contain_aodh_config('keystone_authtoken/auth_type').with_value(params[:auth_type])
is_expected.to contain_aodh_config('keystone_authtoken/auth_version').with_value(params[:auth_version])
is_expected.to contain_aodh_config('keystone_authtoken/cache').with_value(params[:cache])
is_expected.to contain_aodh_config('keystone_authtoken/cafile').with_value(params[:cafile])
is_expected.to contain_aodh_config('keystone_authtoken/certfile').with_value(params[:certfile])
is_expected.to contain_aodh_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision])
is_expected.to contain_aodh_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind])
is_expected.to contain_aodh_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout])
is_expected.to contain_aodh_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries])
is_expected.to contain_aodh_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog])
is_expected.to contain_aodh_config('keystone_authtoken/keyfile').with_value(params[:keyfile])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy])
is_expected.to contain_aodh_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_aodh_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do
is_expected.to contain_package('python-memcache')
end
end
end
@ -142,7 +140,7 @@ describe 'aodh::keystone::authtoken' do
facts.merge!(OSDefaults.get_facts())
end
it_configures 'aodh::keystone::authtoken'
it_configures 'aodh authtoken'
end
end


Loading…
Cancel
Save