From f2f852bb4bf70e73270dbf9a973ea885a1e70cb3 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 16 May 2017 11:04:31 +0800 Subject: [PATCH] Fix the default parameter value in spec test The default parameter value is 'SERVICE DEFAULT', not 'SERVICE_DEFAULT'. Change-Id: I8ee14b0d442157610d48d259332a7ead1fe1bdd6 Closes-Bug: #1690973 --- spec/classes/neutron_services_bgpvpn_spec.rb | 2 +- .../neutron_services_lbaas_haproxy_spec.rb | 24 +++++++++---------- .../neutron_services_lbaas_octavia_spec.rb | 12 +++++----- spec/classes/neutron_services_lbaas_spec.rb | 2 +- spec/classes/neutron_services_vpnaas_spec.rb | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spec/classes/neutron_services_bgpvpn_spec.rb b/spec/classes/neutron_services_bgpvpn_spec.rb index 301be0055..da8085e78 100644 --- a/spec/classes/neutron_services_bgpvpn_spec.rb +++ b/spec/classes/neutron_services_bgpvpn_spec.rb @@ -20,7 +20,7 @@ describe 'neutron::services::bgpvpn' do let :default_params do { :package_ensure => 'present', - :service_providers => '', + :service_providers => '', :sync_db => true, } end diff --git a/spec/classes/neutron_services_lbaas_haproxy_spec.rb b/spec/classes/neutron_services_lbaas_haproxy_spec.rb index e6a40b989..11c3fd6d6 100644 --- a/spec/classes/neutron_services_lbaas_haproxy_spec.rb +++ b/spec/classes/neutron_services_lbaas_haproxy_spec.rb @@ -23,12 +23,12 @@ require 'spec_helper' describe 'neutron::services::lbaas::haproxy' do let :default_params do - { :interface_driver => '', - :periodic_interval => '', - :loadbalancer_state_path => '', - :user_group => '', - :send_gratuitous_arp => '', - :jinja_config_template => ''} + { :interface_driver => '', + :periodic_interval => '', + :loadbalancer_state_path => '', + :user_group => '', + :send_gratuitous_arp => '', + :jinja_config_template => ''} end context 'with default params' do @@ -37,12 +37,12 @@ describe 'neutron::services::lbaas::haproxy' do end it 'configures haproxy service plugin' do - is_expected.to contain_neutron_config('haproxy/interface_driver').with_value('') - is_expected.to contain_neutron_config('haproxy/periodic_interval').with_value('') - is_expected.to contain_neutron_config('haproxy/loadbalancer_state_path').with_value('') - is_expected.to contain_neutron_config('haproxy/user_group').with_value('') - is_expected.to contain_neutron_config('haproxy/send_gratuitous_arp').with_value('') - is_expected.to contain_neutron_config('haproxy/jinja_config_template').with_value('') + is_expected.to contain_neutron_config('haproxy/interface_driver').with_value('') + is_expected.to contain_neutron_config('haproxy/periodic_interval').with_value('') + is_expected.to contain_neutron_config('haproxy/loadbalancer_state_path').with_value('') + is_expected.to contain_neutron_config('haproxy/user_group').with_value('') + is_expected.to contain_neutron_config('haproxy/send_gratuitous_arp').with_value('') + is_expected.to contain_neutron_config('haproxy/jinja_config_template').with_value('') end end diff --git a/spec/classes/neutron_services_lbaas_octavia_spec.rb b/spec/classes/neutron_services_lbaas_octavia_spec.rb index 4f03f8793..71f179c35 100644 --- a/spec/classes/neutron_services_lbaas_octavia_spec.rb +++ b/spec/classes/neutron_services_lbaas_octavia_spec.rb @@ -24,9 +24,9 @@ describe 'neutron::services::lbaas::octavia' do let :default_params do { :base_url => 'http://127.0.0.1:9876', - :request_poll_interval => '', - :request_poll_timeout => '', - :allocates_vip => ''} + :request_poll_interval => '', + :request_poll_timeout => '', + :allocates_vip => ''} end context 'with default params' do @@ -36,9 +36,9 @@ describe 'neutron::services::lbaas::octavia' do it 'configures octavia service plugin' do is_expected.to contain_neutron_config('octavia/base_url').with_value('http://127.0.0.1:9876') - is_expected.to contain_neutron_config('octavia/request_poll_interval').with_value('') - is_expected.to contain_neutron_config('octavia/request_poll_timeout').with_value('') - is_expected.to contain_neutron_config('octavia/allocates_vip').with_value('') + is_expected.to contain_neutron_config('octavia/request_poll_interval').with_value('') + is_expected.to contain_neutron_config('octavia/request_poll_timeout').with_value('') + is_expected.to contain_neutron_config('octavia/allocates_vip').with_value('') end end diff --git a/spec/classes/neutron_services_lbaas_spec.rb b/spec/classes/neutron_services_lbaas_spec.rb index d9138566d..09fcd63cb 100644 --- a/spec/classes/neutron_services_lbaas_spec.rb +++ b/spec/classes/neutron_services_lbaas_spec.rb @@ -23,7 +23,7 @@ require 'spec_helper' describe 'neutron::services::lbaas' do let :default_params do - { :service_providers => ''} + { :service_providers => ''} end shared_examples_for 'neutron lbaas service plugin' do diff --git a/spec/classes/neutron_services_vpnaas_spec.rb b/spec/classes/neutron_services_vpnaas_spec.rb index 6fcbcde1a..188c0c86e 100644 --- a/spec/classes/neutron_services_vpnaas_spec.rb +++ b/spec/classes/neutron_services_vpnaas_spec.rb @@ -22,7 +22,7 @@ describe 'neutron::services::vpnaas' do let :default_params do { :package_ensure => 'present', - :service_providers => ''} + :service_providers => ''} end shared_examples_for 'neutron vpnaas service plugin' do