openstack/puppet-swift
Code Issues Proposed changes

Merge "bulk: Remove redundant hard-coded defaults"

Browse Source
This commit is contained in:
Zuul
2022-09-07 19:57:35 +00:00
committed by Gerrit Code Review
parent d9d27dcb26 10aef4e2ba
commit 968b8e1683
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
manifests/proxy/bulk.pp
View File

@@ -20,28 +20,29 @@
# === Parameters # === Parameters
# #
# [*max_containers_per_extraction*] # [*max_containers_per_extraction*]
# The maximum number of containers that can be extracted from an archive. # (Optional) The maximum number of containers that can be extracted from
# Default to 10000. # an archive.
# Defaults to $::os_service_default.
# #
# [*max_failed_extractions*] # [*max_failed_extractions*]
# The maximum number of failed extractions allowed when an archive has # (Optional) The maximum number of failed extractions allowed when an archive
# extraction failures. # has extraction failures.
# Default to 1000. # Defaults to $::os_service_default.
# #
# [*max_deletes_per_request*] # [*max_deletes_per_request*]
# The maximum number of deletes allowed by each request. # (Optional) The maximum number of deletes allowed by each request.
# Default to 10000. # Defaults to $::os_service_default.
# #
# [*yield_frequency*] # [*yield_frequency*]
# The frequency the server will spit out an ' ' to keep the connection alive # (Optional) The frequency the server will spit out an ' ' to keep
# while its processing the request. # the connection alive while its processing the request.
# Default to 10. # Defaults to $::os_service_default.
# #
class swift::proxy::bulk( class swift::proxy::bulk(
$max_containers_per_extraction = '10000', $max_containers_per_extraction = $::os_service_default,
$max_failed_extractions = '1000', $max_failed_extractions = $::os_service_default,
$max_deletes_per_request = '10000', $max_deletes_per_request = $::os_service_default,
$yield_frequency = '10', $yield_frequency = $::os_service_default,
) { ) {
include swift::deps include swift::deps

24
spec/classes/swift_proxy_bulk_spec.rb
View File

@@ -24,27 +24,27 @@ describe 'swift::proxy::bulk' do
shared_examples 'swift::proxy::bulk' do shared_examples 'swift::proxy::bulk' do
describe "when using default parameters" do describe "when using default parameters" do
it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') } it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('10000') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('1000') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('10000') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('10') } it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('<SERVICE DEFAULT>') }
end end
describe "when overriding default parameters" do describe "when overriding default parameters" do
let :params do let :params do
{ {
:max_containers_per_extraction => 5000, :max_containers_per_extraction => 10000,
:max_failed_extractions => 500, :max_failed_extractions => 1000,
:max_deletes_per_request => 5000, :max_deletes_per_request => 10001,
:yield_frequency => 60, :yield_frequency => 10,
} }
end end
it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') } it { is_expected.to contain_swift_proxy_config('filter:bulk/use').with_value('egg:swift#bulk') }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value('5000') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_containers_per_extraction').with_value(10000) }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value('500') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_failed_extractions').with_value(1000) }
it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value('5000') } it { is_expected.to contain_swift_proxy_config('filter:bulk/max_deletes_per_request').with_value(10001) }
it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value('60') } it { is_expected.to contain_swift_proxy_config('filter:bulk/yield_frequency').with_value(10) }
end end
end end