From 4fbb82c79aa1366a5f44841de4e47eab0a8b97c6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 26 Aug 2021 20:49:38 +0900 Subject: [PATCH] Do not test authtoken parameters directly The authtoken parameters are not managed directly but managed by the keystone::resource::authtoken class. Thus we should avoid testing parameters directly otherwise any change in the resource type can cause test failures. Change-Id: I60b68cb78f63320fd1df46e0dccda2e8babe28ba --- .../barbican_keystone_authtoken_spec.rb | 249 ++++++++---------- 1 file changed, 117 insertions(+), 132 deletions(-) diff --git a/spec/classes/barbican_keystone_authtoken_spec.rb b/spec/classes/barbican_keystone_authtoken_spec.rb index e95c87f1..7b5a49e7 100644 --- a/spec/classes/barbican_keystone_authtoken_spec.rb +++ b/spec/classes/barbican_keystone_authtoken_spec.rb @@ -1,22 +1,3 @@ -# -# Copyright (C) 2016 Red Hat Inc. -# -# Author: Ade Lee -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# Unit tests for barbican::keystone::authtoken class -# require 'spec_helper' describe 'barbican::keystone::authtoken' do @@ -25,131 +6,133 @@ describe 'barbican::keystone::authtoken' do { :password => 'barbican_password', } end - shared_examples 'barbican authtoken' do + shared_examples 'barbican::keystone::authtoken' do context 'with default parameters' do it 'configure keystone_authtoken' do - is_expected.to contain_barbican_config('keystone_authtoken/username').with_value('barbican') - is_expected.to contain_barbican_config('keystone_authtoken/password').with_value('barbican_password') - is_expected.to contain_barbican_config('keystone_authtoken/auth_url').with_value('http://localhost:5000') - is_expected.to contain_barbican_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_barbican_config('keystone_authtoken/user_domain_name').with_value('Default') - is_expected.to contain_barbican_config('keystone_authtoken/project_domain_name').with_value('Default') - is_expected.to contain_barbican_config('keystone_authtoken/insecure').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/auth_section').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/auth_type').with_value('password') - is_expected.to contain_barbican_config('keystone_authtoken/www_authenticate_uri').with_value('http://localhost:5000') - is_expected.to contain_barbican_config('keystone_authtoken/auth_version').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/cache').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/cafile').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/certfile').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/delay_auth_decision').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/enforce_token_bind').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/http_connect_timeout').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/http_request_max_retries').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/include_service_catalog').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/keyfile').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_dead_retry').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_maxsize').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_socket_timeout').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_unused_timeout').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_secret_key').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_security_strategy').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcache_use_advanced_pool').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/memcached_servers').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/region_name').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/service_type').with_value('') - is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value('') + is_expected.to contain_keystone__resource__authtoken('barbican_config').with( + :username => 'barbican', + :password => 'barbican_password', + :auth_url => 'http://localhost:5000', + :project_name => 'services', + :user_domain_name => 'Default', + :project_domain_name => 'Default', + :insecure => '', + :auth_section => '', + :auth_type => 'password', + :www_authenticate_uri => 'http://localhost:5000', + :auth_version => '', + :cache => '', + :cafile => '', + :certfile => '', + :delay_auth_decision => '', + :enforce_token_bind => '', + :http_connect_timeout => '', + :http_request_max_retries => '', + :include_service_catalog => '', + :keyfile => '', + :memcache_pool_conn_get_timeout => '', + :memcache_pool_dead_retry => '', + :memcache_pool_maxsize => '', + :memcache_pool_socket_timeout => '', + :memcache_pool_unused_timeout => '', + :memcache_secret_key => '', + :memcache_security_strategy => '', + :memcache_use_advanced_pool => '', + :memcached_servers => '', + :manage_memcache_package => false, + :region_name => '', + :token_cache_time => '', + :service_token_roles => '', + :service_token_roles_required => '', + :service_type => '', + :interface => '', + ) end end context 'when overriding parameters' do before do params.merge!({ - :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, - :service_type => 'identity', - :interface => 'internal', + :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, + :service_type => 'identity', + :interface => 'internal', }) end it 'configure keystone_authtoken' do - is_expected.to contain_barbican_config('keystone_authtoken/www_authenticate_uri').with_value('https://10.0.0.1:9999/') - is_expected.to contain_barbican_config('keystone_authtoken/username').with_value(params[:username]) - is_expected.to contain_barbican_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true) - is_expected.to contain_barbican_config('keystone_authtoken/auth_url').with_value(params[:auth_url]) - is_expected.to contain_barbican_config('keystone_authtoken/project_name').with_value(params[:project_name]) - is_expected.to contain_barbican_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name]) - is_expected.to contain_barbican_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name]) - is_expected.to contain_barbican_config('keystone_authtoken/insecure').with_value(params[:insecure]) - is_expected.to contain_barbican_config('keystone_authtoken/auth_section').with_value(params[:auth_section]) - is_expected.to contain_barbican_config('keystone_authtoken/auth_type').with_value(params[:auth_type]) - is_expected.to contain_barbican_config('keystone_authtoken/auth_version').with_value(params[:auth_version]) - is_expected.to contain_barbican_config('keystone_authtoken/cache').with_value(params[:cache]) - is_expected.to contain_barbican_config('keystone_authtoken/cafile').with_value(params[:cafile]) - is_expected.to contain_barbican_config('keystone_authtoken/certfile').with_value(params[:certfile]) - is_expected.to contain_barbican_config('keystone_authtoken/delay_auth_decision').with_value(params[:delay_auth_decision]) - is_expected.to contain_barbican_config('keystone_authtoken/enforce_token_bind').with_value(params[:enforce_token_bind]) - is_expected.to contain_barbican_config('keystone_authtoken/http_connect_timeout').with_value(params[:http_connect_timeout]) - is_expected.to contain_barbican_config('keystone_authtoken/http_request_max_retries').with_value(params[:http_request_max_retries]) - is_expected.to contain_barbican_config('keystone_authtoken/include_service_catalog').with_value(params[:include_service_catalog]) - is_expected.to contain_barbican_config('keystone_authtoken/keyfile').with_value(params[:keyfile]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_conn_get_timeout').with_value(params[:memcache_pool_conn_get_timeout]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_dead_retry').with_value(params[:memcache_pool_dead_retry]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_maxsize').with_value(params[:memcache_pool_maxsize]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_socket_timeout').with_value(params[:memcache_pool_socket_timeout]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_pool_unused_timeout').with_value(params[:memcache_pool_unused_timeout]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_secret_key').with_value(params[:memcache_secret_key]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_security_strategy').with_value(params[:memcache_security_strategy]) - is_expected.to contain_barbican_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool]) - is_expected.to contain_barbican_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') - is_expected.to contain_barbican_config('keystone_authtoken/region_name').with_value(params[:region_name]) - is_expected.to contain_barbican_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) - is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) - is_expected.to contain_barbican_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) - is_expected.to contain_barbican_config('keystone_authtoken/service_type').with_value(params[:service_type]) - is_expected.to contain_barbican_config('keystone_authtoken/interface').with_value(params[:interface]) - end - - it 'installs python memcache package' do - is_expected.to contain_package('python-memcache') + is_expected.to contain_keystone__resource__authtoken('barbican_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, + :service_type => 'identity', + :interface => 'internal', + ) end end @@ -162,7 +145,9 @@ describe 'barbican::keystone::authtoken' do end it 'configure keystone_authtoken' do - is_expected.to contain_barbican_config('keystone_authtoken/username').with_value(params[:params]['username']) + is_expected.to contain_keystone__resource__authtoken('barbican_config').with( + :username => 'myotheruser', + ) end end end @@ -175,7 +160,7 @@ describe 'barbican::keystone::authtoken' do facts.merge!(OSDefaults.get_facts()) end - it_configures 'barbican authtoken' + it_configures 'barbican::keystone::authtoken' end end