Merge "Add support to manage default quota about l7policy/rule"

This commit is contained in:
Zuul 2022-01-07 22:54:27 +00:00 committed by Gerrit Code Review
commit d77268d1fa
3 changed files with 30 additions and 3 deletions

View File

@ -24,12 +24,22 @@
# (optional) Default per project health monitor quota.
# Defaults to $::os_service_default
#
# [*default_l7policy_quota*]
# (optional) Default per project l7policy quota.
# Defaults to $::os_service_default
#
# [*default_l7rule_quota*]
# (optional) Default per project l7rule quota.
# Defaults to $::os_service_default
#
class octavia::quota (
$default_load_balancer_quota = $::os_service_default,
$default_listener_quota = $::os_service_default,
$default_member_quota = $::os_service_default,
$default_pool_quota = $::os_service_default,
$default_health_monitor_quota = $::os_service_default,
$default_l7policy_quota = $::os_service_default,
$default_l7rule_quota = $::os_service_default,
) {
include octavia::deps
@ -40,5 +50,7 @@ class octavia::quota (
'quotas/default_member_quota': value => $default_member_quota;
'quotas/default_pool_quota': value => $default_pool_quota;
'quotas/default_health_monitor_quota': value => $default_health_monitor_quota;
'quotas/default_l7policy_quota': value => $default_l7policy_quota;
'quotas/default_l7rule_quota': value => $default_l7rule_quota;
}
}

View File

@ -0,0 +1,7 @@
---
features:
- |
The ``octavia::quota`` class now supports the following two parameters.
- ``default_l7policy_quota``
- ``default_l7rule_quota``

View File

@ -7,7 +7,9 @@ describe 'octavia::quota' do
:default_listener_quota => '<SERVICE DEFAULT>',
:default_member_quota => '<SERVICE DEFAULT>',
:default_pool_quota => '<SERVICE DEFAULT>',
:default_health_monitor_quota => '<SERVICE DEFAULT>'
:default_health_monitor_quota => '<SERVICE DEFAULT>',
:default_l7policy_quota => '<SERVICE DEFAULT>',
:default_l7rule_quota => '<SERVICE DEFAULT>',
}
end
@ -27,6 +29,8 @@ describe 'octavia::quota' do
is_expected.to contain_octavia_config('quotas/default_member_quota').with_value(p[:default_member_quota])
is_expected.to contain_octavia_config('quotas/default_pool_quota').with_value(p[:default_pool_quota])
is_expected.to contain_octavia_config('quotas/default_health_monitor_quota').with_value(p[:default_health_monitor_quota])
is_expected.to contain_octavia_config('quotas/default_l7policy_quota').with_value(p[:default_l7policy_quota])
is_expected.to contain_octavia_config('quotas/default_l7rule_quota').with_value(p[:default_l7rule_quota])
end
context 'configure quota with parameters' do
@ -36,16 +40,20 @@ describe 'octavia::quota' do
:default_listener_quota => 20,
:default_member_quota => 30,
:default_pool_quota => 40,
:default_health_monitor_quota => 50
:default_health_monitor_quota => 50,
:default_l7policy_quota => 60,
:default_l7rule_quota => 70,
})
end
it 'contains overrided values' do
it 'contains the defined values' do
is_expected.to contain_octavia_config('quotas/default_load_balancer_quota').with_value(p[:default_load_balancer_quota])
is_expected.to contain_octavia_config('quotas/default_listener_quota').with_value(p[:default_listener_quota])
is_expected.to contain_octavia_config('quotas/default_member_quota').with_value(p[:default_member_quota])
is_expected.to contain_octavia_config('quotas/default_pool_quota').with_value(p[:default_pool_quota])
is_expected.to contain_octavia_config('quotas/default_health_monitor_quota').with_value(p[:default_health_monitor_quota])
is_expected.to contain_octavia_config('quotas/default_l7policy_quota').with_value(p[:default_l7policy_quota])
is_expected.to contain_octavia_config('quotas/default_l7rule_quota').with_value(p[:default_l7rule_quota])
end
end
end