openstack/puppet-swift
Code Issues Proposed changes

unit tests: make Keystone_endpoint match service by name/type

Browse Source 
Since a chance in puppet-keystone (1], we now match an endpoint with a
service name/type.
)
[1] http://git.openstack.org/cgit/openstack/puppet-keystone/commit/?id=0a4e06abb0f5b3f324464ff5219d2885816311ce

Closes-Bug: #1528308

Change-Id: I5c1a1f8b9304ba50168b27a236fb16db3d8dca55
This commit is contained in:
Emilien Macchi
2015-12-21 20:45:16 +01:00
parent e61b1aa481
commit 90a3744af9
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/classes/swift_keystone_auth_spec.rb
View File

@@ -57,14 +57,14 @@ describe 'swift::keystone::auth' do
it { is_expected.to contain_keystone_role(role_name).with_ensure('present') } it { is_expected.to contain_keystone_role(role_name).with_ensure('present') }
end end
it { is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}").with( it { is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}::object-store").with(
:ensure => 'present', :ensure => 'present',
:public_url => params[:public_url], :public_url => params[:public_url],
:admin_url => params[:admin_url], :admin_url => params[:admin_url],
:internal_url => params[:internal_url], :internal_url => params[:internal_url],
)} )}
it { is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}_s3").with( it { is_expected.to contain_keystone_endpoint("#{params[:region]}/#{params[:auth_name]}_s3::s3").with(
:ensure => 'present', :ensure => 'present',
:public_url => params[:public_url_s3], :public_url => params[:public_url_s3],
:admin_url => params[:admin_url_s3], :admin_url => params[:admin_url_s3],
@@ -76,7 +76,7 @@ describe 'swift::keystone::auth' do
params.merge!(:configure_endpoint => false) params.merge!(:configure_endpoint => false)
end end
it { is_expected.to_not contain_keystone_endpoint('RegionOne/swift') } it { is_expected.to_not contain_keystone_endpoint('RegionOne/swift::object-store') }
end end
context 'when disabling S3 endpoint' do context 'when disabling S3 endpoint' do
@@ -84,8 +84,8 @@ describe 'swift::keystone::auth' do
params.merge!(:configure_s3_endpoint => false) params.merge!(:configure_s3_endpoint => false)
end end
it { is_expected.to_not contain_keystone_service('swift_s3') } it { is_expected.to_not contain_keystone_service('swift_s3::s3') }
it { is_expected.to_not contain_keystone_endpoint('RegionOne/swift_s3') } it { is_expected.to_not contain_keystone_endpoint('RegionOne/swift_s3::s3') }
end end
end end
@@ -114,14 +114,14 @@ describe 'swift::keystone::auth' do
default_params.merge( params ) default_params.merge( params )
end end
it { is_expected.to contain_keystone_endpoint("#{p[:region]}/#{p[:auth_name]}").with( it { is_expected.to contain_keystone_endpoint("#{p[:region]}/#{p[:auth_name]}::object-store").with(
:ensure => 'present', :ensure => 'present',
:public_url => "#{p[:public_protocol]}://#{p[:public_address]}:#{p[:public_port]}/v1/#{p[:endpoint_prefix]}_%(tenant_id)s", :public_url => "#{p[:public_protocol]}://#{p[:public_address]}:#{p[:public_port]}/v1/#{p[:endpoint_prefix]}_%(tenant_id)s",
:admin_url => "#{p[:admin_protocol]}://#{p[:admin_address]}:#{p[:port]}", :admin_url => "#{p[:admin_protocol]}://#{p[:admin_address]}:#{p[:port]}",
:internal_url => "#{p[:internal_protocol]}://#{p[:internal_address]}:#{p[:port]}/v1/#{p[:endpoint_prefix]}_%(tenant_id)s" :internal_url => "#{p[:internal_protocol]}://#{p[:internal_address]}:#{p[:port]}/v1/#{p[:endpoint_prefix]}_%(tenant_id)s"
)} )}
it { is_expected.to contain_keystone_endpoint("#{p[:region]}/#{p[:auth_name]}_s3").with( it { is_expected.to contain_keystone_endpoint("#{p[:region]}/#{p[:auth_name]}_s3::s3").with(
:ensure => 'present', :ensure => 'present',
:public_url => "#{p[:public_protocol]}://#{p[:public_address]}:#{p[:port]}", :public_url => "#{p[:public_protocol]}://#{p[:public_address]}:#{p[:port]}",
:admin_url => "#{p[:admin_protocol]}://#{p[:admin_address]}:#{p[:port]}", :admin_url => "#{p[:admin_protocol]}://#{p[:admin_address]}:#{p[:port]}",
@@ -146,13 +146,13 @@ describe 'swift::keystone::auth' do
:roles => ['admin'], :roles => ['admin'],
)} )}
it { is_expected.to contain_keystone_service(p[:auth_name]).with( it { is_expected.to contain_keystone_service("#{p[:auth_name]}::object-store").with(
:ensure => 'present', :ensure => 'present',
:type => 'object-store', :type => 'object-store',
:description => 'Openstack Object-Store Service' :description => 'Openstack Object-Store Service'
)} )}
it { is_expected.to contain_keystone_service("#{p[:auth_name]}_s3").with( it { is_expected.to contain_keystone_service("#{p[:auth_name]}_s3::s3").with(
:ensure => 'present', :ensure => 'present',
:type => 's3', :type => 's3',
:description => 'Openstack S3 Service' :description => 'Openstack S3 Service'
@@ -192,12 +192,12 @@ describe 'swift::keystone::auth' do
is_expected.to contain_keystone_user_role('swift@services') is_expected.to contain_keystone_user_role('swift@services')
end end
it 'configures correct service name' do it 'configures correct service name' do
is_expected.to contain_keystone_service('swift_service') is_expected.to contain_keystone_service('swift_service::object-store')
is_expected.to contain_keystone_service('swift_service_s3') is_expected.to contain_keystone_service('swift_service_s3::s3')
end end
it 'configures correct endpoint name' do it 'configures correct endpoint name' do
is_expected.to contain_keystone_endpoint('RegionOne/swift_service') is_expected.to contain_keystone_endpoint('RegionOne/swift_service::object-store')
is_expected.to contain_keystone_endpoint('RegionOne/swift_service_s3') is_expected.to contain_keystone_endpoint('RegionOne/swift_service_s3::s3')
end end
end end