From d333402f77771f0c941d4722f428d8ec2f16dc73 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 15 Sep 2025 01:53:18 +0900 Subject: [PATCH] Replace verify_contents This is provided by puppetlabs_spec_helper which we aim to replace by voxpupuli-test. Change-Id: I1669d43806b8be02fae2366a3d7f5d0e4ecbe01c Signed-off-by: Takashi Kajinami --- .../ceilometer_agent_notification_spec.rb | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb index 82eead35..67c3e1d3 100644 --- a/spec/classes/ceilometer_agent_notification_spec.rb +++ b/spec/classes/ceilometer_agent_notification_spec.rb @@ -112,27 +112,25 @@ describe 'ceilometer::agent::notification' do ) } it { is_expected.to contain_file('event_pipeline').with( - :ensure => 'file', - :path => '/etc/ceilometer/event_pipeline.yaml', - :owner => 'root', - :group => 'ceilometer', - :mode => '0640', - ) } + :ensure => 'file', + :path => '/etc/ceilometer/event_pipeline.yaml', + :owner => 'root', + :group => 'ceilometer', + :mode => '0640', + :content => '--- +sources: + - name: event_source + events: + - "*" + sinks: + - event_sink +sinks: + - name: event_sink + publishers: + - gnocchi:// +', + )} - it { 'configures event_pipeline with the default notifier' - verify_contents(catalogue, 'event_pipeline', [ - "---", - "sources:", - " - name: event_source", - " events:", - " - \"*\"", - " sinks:", - " - event_sink", - "sinks:", - " - name: event_sink", - " publishers:", - " - gnocchi://", - ])} it { is_expected.to contain_ceilometer_config('DEFAULT/event_pipeline_cfg_file').with_value('/etc/ceilometer/event_pipeline.yaml') } end @@ -142,21 +140,27 @@ describe 'ceilometer::agent::notification' do :event_pipeline_publishers => ['notifier://', 'notifier://?topic=alarm.all'] ) } - it { 'configures event_pipeline with multiple publishers' - verify_contents(catalogue, 'event_pipeline', [ - "---", - "sources:", - " - name: event_source", - " events:", - " - \"*\"", - " sinks:", - " - event_sink", - "sinks:", - " - name: event_sink", - " publishers:", - " - notifier://", - " - notifier://?topic=alarm.all", - ])} + it { is_expected.to contain_file('event_pipeline').with( + :ensure => 'file', + :path => '/etc/ceilometer/event_pipeline.yaml', + :owner => 'root', + :group => 'ceilometer', + :mode => '0640', + :content => '--- +sources: + - name: event_source + events: + - "*" + sinks: + - event_sink +sinks: + - name: event_sink + publishers: + - notifier:// + - notifier://?topic=alarm.all +' + )} + it { is_expected.to contain_ceilometer_config('DEFAULT/event_pipeline_cfg_file').with_value('/etc/ceilometer/event_pipeline.yaml') } end @@ -195,6 +199,7 @@ sinks: - gnocchi:// ', )} + it { is_expected.to contain_ceilometer_config('DEFAULT/event_pipeline_cfg_file').with_value('/etc/ceilometer/event_pipeline.yaml') } end @@ -256,6 +261,7 @@ sinks: - gnocchi:// ', )} + it { is_expected.to contain_ceilometer_config('DEFAULT/pipeline_cfg_file').with_value('/etc/ceilometer/pipeline.yaml') } end