openstack/puppet-ironic
Code Issues Proposed changes

Merge "oslo log: check puppet resource instead of actual config in spec"

Browse Source
This commit is contained in:
Jenkins
2017-03-29 02:44:50 +00:00
committed by Gerrit Code Review
parent 666dd2b1c2 7f7418bcf8
commit b3185cc67d
3 changed files with 90 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
manifests/inspector/logging.pp
View File

@@ -107,31 +107,24 @@ class ironic::inspector::logging(
include ::ironic::deps
$debug_real = pick($::ironic::inspector::debug,$debug)
if is_service_default($default_log_levels) {
$default_log_levels_real = $default_log_levels
} else {
$default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',')
oslo::log { 'ironic_inspector_config':
debug => $debug_real,
use_stderr => $use_stderr,
use_syslog => $use_syslog,
log_dir => $log_dir,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,
logging_debug_format_suffix => $logging_debug_format_suffix,
logging_exception_prefix => $logging_exception_prefix,
log_config_append => $log_config_append,
default_log_levels => $default_log_levels,
publish_errors => $publish_errors,
fatal_deprecations => $fatal_deprecations,
instance_format => $instance_format,
instance_uuid_format => $instance_uuid_format,
log_date_format => $log_date_format,
}
ironic_inspector_config {
'DEFAULT/debug': value => $debug_real;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/use_syslog': value => $use_syslog;
'DEFAULT/log_dir': value => $log_dir;
'DEFAULT/syslog_log_facility': value => $log_facility;
'DEFAULT/logging_context_format_string': value => $logging_context_format_string;
'DEFAULT/logging_default_format_string': value => $logging_default_format_string;
'DEFAULT/logging_debug_format_suffix': value => $logging_debug_format_suffix;
'DEFAULT/logging_exception_prefix': value => $logging_exception_prefix;
'DEFAULT/log_config_append': value => $log_config_append;
'DEFAULT/default_log_levels': value => $default_log_levels_real;
'DEFAULT/publish_errors': value => $publish_errors;
'DEFAULT/fatal_deprecations': value => $fatal_deprecations;
'DEFAULT/instance_format': value => $instance_format;
'DEFAULT/instance_uuid_format': value => $instance_uuid_format;
'DEFAULT/log_date_format': value => $log_date_format;
}
}

84
spec/classes/ironic_inspector_logging_spec.rb
View File

@@ -16,9 +16,9 @@ describe 'ironic::inspector::logging' do
:log_config_append => '/etc/ironic-inspector/logging.conf',
:publish_errors => true,
:default_log_levels => {
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
:fatal_deprecations => true,
:instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ',
@@ -54,61 +54,51 @@ describe 'ironic::inspector::logging' do
end
shared_examples 'basic default logging settings' do
it 'configures ironic logging settings with default values' do
is_expected.to contain_ironic_inspector_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/log_dir').with(:value => '/var/log/ironic-inspector')
is_expected.to contain_ironic_inspector_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
it 'configures ironic-inspector logging settings with default values' do
is_expected.to contain_oslo__log('ironic_inspector_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic-inspector',
:debug => '<SERVICE DEFAULT>',
)
end
end
shared_examples 'basic non-default logging settings' do
it 'configures ironic logging settings with non-default values' do
is_expected.to contain_ironic_inspector_config('DEFAULT/use_syslog').with(:value => 'true')
is_expected.to contain_ironic_inspector_config('DEFAULT/use_stderr').with(:value => 'false')
is_expected.to contain_ironic_inspector_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_FOO')
is_expected.to contain_ironic_inspector_config('DEFAULT/log_dir').with(:value => '/var/log')
is_expected.to contain_ironic_inspector_config('DEFAULT/debug').with(:value => 'true')
it 'configures ironic-inspector logging settings with non-default values' do
is_expected.to contain_oslo__log('ironic_inspector_config').with(
:use_syslog => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:debug => true,
)
end
end
shared_examples_for 'logging params set' do
it 'enables logging params' do
is_expected.to contain_ironic_inspector_config('DEFAULT/logging_context_format_string').with_value(
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s')
is_expected.to contain_ironic_inspector_config('DEFAULT/logging_default_format_string').with_value(
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s')
is_expected.to contain_ironic_inspector_config('DEFAULT/logging_debug_format_suffix').with_value(
'%(funcName)s %(pathname)s:%(lineno)d')
is_expected.to contain_ironic_inspector_config('DEFAULT/logging_exception_prefix').with_value(
'%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s')
is_expected.to contain_ironic_inspector_config('DEFAULT/log_config_append').with_value(
'/etc/ironic-inspector/logging.conf')
is_expected.to contain_ironic_inspector_config('DEFAULT/publish_errors').with_value(
true)
is_expected.to contain_ironic_inspector_config('DEFAULT/default_log_levels').with_value(
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
is_expected.to contain_ironic_inspector_config('DEFAULT/fatal_deprecations').with_value(
true)
is_expected.to contain_ironic_inspector_config('DEFAULT/instance_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_ironic_inspector_config('DEFAULT/instance_uuid_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_ironic_inspector_config('DEFAULT/log_date_format').with_value(
'%Y-%m-%d %H:%M:%S')
is_expected.to contain_oslo__log('ironic_inspector_config').with(
:logging_context_format_string =>
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
:logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
:logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d',
:logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s',
:log_config_append => '/etc/ironic-inspector/logging.conf',
:publish_errors => true,
:default_log_levels => {
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
:fatal_deprecations => true,
:instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ',
:log_date_format => '%Y-%m-%d %H:%M:%S',
)
end
end
shared_examples_for 'logging params unset' do
[ :logging_context_format_string, :logging_default_format_string,
:logging_debug_format_suffix, :logging_exception_prefix,
@@ -116,7 +106,7 @@ describe 'ironic::inspector::logging' do
:default_log_levels, :fatal_deprecations,
:instance_format, :instance_uuid_format,
:log_date_format, ].each { |param|
it { is_expected.to contain_ironic_inspector_config("DEFAULT/#{param}").with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_oslo__log('ironic_inspector_config').with("#{param}" => '<SERVICE DEFAULT>') }
}
end

80
spec/classes/ironic_logging_spec.rb
View File

@@ -16,9 +16,9 @@ describe 'ironic::logging' do
:log_config_append => '/etc/ironic/logging.conf',
:publish_errors => true,
:default_log_levels => {
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
:fatal_deprecations => true,
:instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ',
@@ -55,60 +55,50 @@ describe 'ironic::logging' do
shared_examples 'basic default logging settings' do
it 'configures ironic logging settings with default values' do
is_expected.to contain_ironic_config('DEFAULT/use_syslog').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/use_stderr').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/log_dir').with(:value => '/var/log/ironic')
is_expected.to contain_ironic_config('DEFAULT/debug').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_oslo__log('ironic_config').with(
:use_syslog => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:syslog_log_facility => '<SERVICE DEFAULT>',
:log_dir => '/var/log/ironic',
:debug => '<SERVICE DEFAULT>',
)
end
end
shared_examples 'basic non-default logging settings' do
it 'configures ironic logging settings with non-default values' do
is_expected.to contain_ironic_config('DEFAULT/use_syslog').with(:value => 'true')
is_expected.to contain_ironic_config('DEFAULT/use_stderr').with(:value => 'false')
is_expected.to contain_ironic_config('DEFAULT/syslog_log_facility').with(:value => 'LOG_FOO')
is_expected.to contain_ironic_config('DEFAULT/log_dir').with(:value => '/var/log')
is_expected.to contain_ironic_config('DEFAULT/debug').with(:value => 'true')
is_expected.to contain_oslo__log('ironic_config').with(
:use_syslog => true,
:use_stderr => false,
:syslog_log_facility => 'LOG_FOO',
:log_dir => '/var/log',
:debug => true,
)
end
end
shared_examples_for 'logging params set' do
it 'enables logging params' do
is_expected.to contain_ironic_config('DEFAULT/logging_context_format_string').with_value(
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s')
is_expected.to contain_ironic_config('DEFAULT/logging_default_format_string').with_value(
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s')
is_expected.to contain_ironic_config('DEFAULT/logging_debug_format_suffix').with_value(
'%(funcName)s %(pathname)s:%(lineno)d')
is_expected.to contain_ironic_config('DEFAULT/logging_exception_prefix').with_value(
'%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s')
is_expected.to contain_ironic_config('DEFAULT/log_config_append').with_value(
'/etc/ironic/logging.conf')
is_expected.to contain_ironic_config('DEFAULT/publish_errors').with_value(
true)
is_expected.to contain_ironic_config('DEFAULT/default_log_levels').with_value(
'amqp=WARN,amqplib=WARN,boto=WARN,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,sqlalchemy=WARN,suds=INFO')
is_expected.to contain_ironic_config('DEFAULT/fatal_deprecations').with_value(
true)
is_expected.to contain_ironic_config('DEFAULT/instance_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_ironic_config('DEFAULT/instance_uuid_format').with_value(
'[instance: %(uuid)s] ')
is_expected.to contain_ironic_config('DEFAULT/log_date_format').with_value(
'%Y-%m-%d %H:%M:%S')
is_expected.to contain_oslo__log('ironic_config').with(
:logging_context_format_string =>
'%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
:logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
:logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d',
:logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s',
:log_config_append => '/etc/ironic/logging.conf',
:publish_errors => true,
:default_log_levels => {
'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN',
'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN',
'requests.packages.urllib3.connectionpool' => 'WARN' },
:fatal_deprecations => true,
:instance_format => '[instance: %(uuid)s] ',
:instance_uuid_format => '[instance: %(uuid)s] ',
:log_date_format => '%Y-%m-%d %H:%M:%S',
)
end
end
shared_examples_for 'logging params unset' do
[ :logging_context_format_string, :logging_default_format_string,
:logging_debug_format_suffix, :logging_exception_prefix,
@@ -116,7 +106,7 @@ describe 'ironic::logging' do
:default_log_levels, :fatal_deprecations,
:instance_format, :instance_uuid_format,
:log_date_format, ].each { |param|
it { is_expected.to contain_ironic_config("DEFAULT/#{param}").with_value('<SERVICE DEFAULT>') }
it { is_expected.to contain_oslo__log('ironic_config').with("#{param}" => '<SERVICE DEFAULT>') }
}
end