openstack/puppet-neutron
Code Issues Proposed changes

Validate more options

Browse Source 
Some of the config options were not asserted in unit tests. Improve
the coverage to catch any regressions.

Change-Id: Ia8a86d77692aed575daba1a82d9f40ece27e0220
This commit is contained in:
Takashi Kajinami
2024-05-04 14:21:57 +09:00
parent 777c160d50
commit 8a8d925531
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb
View File

@@ -40,6 +40,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do
should contain_ironic_neutron_agent_config('ironic/cafile').with_value('<SERVICE DEFAULT>') should contain_ironic_neutron_agent_config('ironic/cafile').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/certfile').with_value('<SERVICE DEFAULT>') should contain_ironic_neutron_agent_config('ironic/certfile').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/keyfile').with_value('<SERVICE DEFAULT>') should contain_ironic_neutron_agent_config('ironic/keyfile').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/insecure').with_value('<SERVICE DEFAULT>')
should contain_ironic_neutron_agent_config('ironic/auth_type').with_value(p[:auth_type]) should contain_ironic_neutron_agent_config('ironic/auth_type').with_value(p[:auth_type])
should contain_ironic_neutron_agent_config('ironic/auth_url').with_value(p[:auth_url]) should contain_ironic_neutron_agent_config('ironic/auth_url').with_value(p[:auth_url])
should contain_ironic_neutron_agent_config('ironic/user_domain_name').with_value(p[:user_domain_name]) should contain_ironic_neutron_agent_config('ironic/user_domain_name').with_value(p[:user_domain_name])

6
spec/classes/neutron_agents_ml2_ovn_spec.rb
View File

@@ -45,7 +45,13 @@ describe 'neutron::agents::ml2::ovn' do
should contain_neutron_agent_ovn('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovn/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_nb_connection').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovn/ovn_nb_connection').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_nb_private_key').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_nb_certificate').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_nb_ca_cert').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_sb_connection').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovn/ovn_sb_connection').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_sb_private_key').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_sb_certificate').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovn_sb_ca_cert').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovsdb_retry_max_interval').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovn/ovsdb_retry_max_interval').with(:value => '<SERVICE DEFAULT>')
should contain_neutron_agent_ovn('ovn/ovsdb_probe_interval').with(:value => '<SERVICE DEFAULT>') should contain_neutron_agent_ovn('ovn/ovsdb_probe_interval').with(:value => '<SERVICE DEFAULT>')
end end

3
spec/classes/neutron_agents_ovn_metadata_spec.rb
View File

@@ -59,6 +59,9 @@ describe 'neutron::agents::ovn_metadata' do
should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovs/ovsdb_connection').with(:value => 'tcp:127.0.0.1:6640') should contain_ovn_metadata_agent_config('ovs/ovsdb_connection').with(:value => 'tcp:127.0.0.1:6640')
should contain_ovn_metadata_agent_config('ovn/ovn_sb_connection').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('ovn/ovn_sb_connection').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovn_sb_private_key').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovn_sb_certificate').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovn_sb_ca_cert').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovsdb_retry_max_interval').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('ovn/ovsdb_retry_max_interval').with(:value => '<SERVICE DEFAULT>')
should contain_ovn_metadata_agent_config('ovn/ovsdb_probe_interval').with(:value => '<SERVICE DEFAULT>') should contain_ovn_metadata_agent_config('ovn/ovsdb_probe_interval').with(:value => '<SERVICE DEFAULT>')
end end

4
spec/classes/neutron_plugins_ml2_ovn_spec.rb
View File

@@ -23,6 +23,7 @@ describe 'neutron::plugins::ml2::ovn' do
:ovsdb_retry_max_interval => '<SERVICE DEFAULT>', :ovsdb_retry_max_interval => '<SERVICE DEFAULT>',
:ovsdb_probe_interval => '<SERVICE DEFAULT>', :ovsdb_probe_interval => '<SERVICE DEFAULT>',
:neutron_sync_mode => '<SERVICE DEFAULT>', :neutron_sync_mode => '<SERVICE DEFAULT>',
:ovn_metadata_enabled => '<SERVICE DEFAULT>',
:dvr_enabled => '<SERVICE DEFAULT>', :dvr_enabled => '<SERVICE DEFAULT>',
:disable_ovn_dhcp_for_baremetal_ports => '<SERVICE DEFAULT>', :disable_ovn_dhcp_for_baremetal_ports => '<SERVICE DEFAULT>',
:dns_servers => '<SERVICE DEFAULT>', :dns_servers => '<SERVICE DEFAULT>',
@@ -67,6 +68,7 @@ describe 'neutron::plugins::ml2::ovn' do
should contain_neutron_plugin_ml2('ovn/ovsdb_retry_max_interval').with_value(p[:ovsdb_retry_max_interval]) should contain_neutron_plugin_ml2('ovn/ovsdb_retry_max_interval').with_value(p[:ovsdb_retry_max_interval])
should contain_neutron_plugin_ml2('ovn/ovsdb_probe_interval').with_value(p[:ovsdb_probe_interval]) should contain_neutron_plugin_ml2('ovn/ovsdb_probe_interval').with_value(p[:ovsdb_probe_interval])
should contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(p[:neutron_sync_mode]) should contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(p[:neutron_sync_mode])
should contain_neutron_plugin_ml2('ovn/ovn_metadata_enabled').with_value(p[:ovn_metadata_enabled])
should contain_neutron_plugin_ml2('ovn/enable_distributed_floating_ip').with_value(p[:dvr_enabled]) should contain_neutron_plugin_ml2('ovn/enable_distributed_floating_ip').with_value(p[:dvr_enabled])
should contain_neutron_plugin_ml2('ovn/disable_ovn_dhcp_for_baremetal_ports').with_value(p[:disable_ovn_dhcp_for_baremetal_ports]) should contain_neutron_plugin_ml2('ovn/disable_ovn_dhcp_for_baremetal_ports').with_value(p[:disable_ovn_dhcp_for_baremetal_ports])
should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(p[:dns_servers]) should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(p[:dns_servers])
@@ -102,6 +104,7 @@ describe 'neutron::plugins::ml2::ovn' do
:ovsdb_retry_max_interval => 180, :ovsdb_retry_max_interval => 180,
:ovsdb_probe_interval => 60000, :ovsdb_probe_interval => 60000,
:neutron_sync_mode => 'log', :neutron_sync_mode => 'log',
:ovn_metadata_enabled => true,
:dvr_enabled => false, :dvr_enabled => false,
:disable_ovn_dhcp_for_baremetal_ports => false, :disable_ovn_dhcp_for_baremetal_ports => false,
:dns_servers => '8.8.8.8,10.10.10.10', :dns_servers => '8.8.8.8,10.10.10.10',
@@ -132,6 +135,7 @@ describe 'neutron::plugins::ml2::ovn' do
should contain_neutron_plugin_ml2('ovn/ovsdb_retry_max_interval').with_value(p[:ovsdb_retry_max_interval]) should contain_neutron_plugin_ml2('ovn/ovsdb_retry_max_interval').with_value(p[:ovsdb_retry_max_interval])
should contain_neutron_plugin_ml2('ovn/ovsdb_probe_interval').with_value(p[:ovsdb_probe_interval]) should contain_neutron_plugin_ml2('ovn/ovsdb_probe_interval').with_value(p[:ovsdb_probe_interval])
should contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(p[:neutron_sync_mode]) should contain_neutron_plugin_ml2('ovn/neutron_sync_mode').with_value(p[:neutron_sync_mode])
should contain_neutron_plugin_ml2('ovn/ovn_metadata_enabled').with_value(p[:ovn_metadata_enabled])
should contain_neutron_plugin_ml2('ovn/enable_distributed_floating_ip').with_value(p[:dvr_enabled]) should contain_neutron_plugin_ml2('ovn/enable_distributed_floating_ip').with_value(p[:dvr_enabled])
should contain_neutron_plugin_ml2('ovn/disable_ovn_dhcp_for_baremetal_ports').with_value(p[:disable_ovn_dhcp_for_baremetal_ports]) should contain_neutron_plugin_ml2('ovn/disable_ovn_dhcp_for_baremetal_ports').with_value(p[:disable_ovn_dhcp_for_baremetal_ports])
should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(p[:dns_servers]) should contain_neutron_plugin_ml2('ovn/dns_servers').with_value(p[:dns_servers])

4
spec/classes/neutron_quota_spec.rb
View File

@@ -7,6 +7,7 @@ describe 'neutron::quota' do
let :default_params do let :default_params do
{ {
:default_quota => '<SERVICE DEFAULT>',
:quota_network => '<SERVICE DEFAULT>', :quota_network => '<SERVICE DEFAULT>',
:quota_subnet => '<SERVICE DEFAULT>', :quota_subnet => '<SERVICE DEFAULT>',
:quota_port => '<SERVICE DEFAULT>', :quota_port => '<SERVICE DEFAULT>',
@@ -14,6 +15,7 @@ describe 'neutron::quota' do
:quota_floatingip => '<SERVICE DEFAULT>', :quota_floatingip => '<SERVICE DEFAULT>',
:quota_security_group => '<SERVICE DEFAULT>', :quota_security_group => '<SERVICE DEFAULT>',
:quota_security_group_rule => '<SERVICE DEFAULT>', :quota_security_group_rule => '<SERVICE DEFAULT>',
:quota_driver => '<SERVICE DEFAULT>',
:quota_rbac_policy => '<SERVICE DEFAULT>', :quota_rbac_policy => '<SERVICE DEFAULT>',
} }
end end
@@ -38,6 +40,7 @@ describe 'neutron::quota' do
context 'with provided parameters' do context 'with provided parameters' do
before do before do
params.merge!({ params.merge!({
:default_quota => -1,
:quota_network => 20, :quota_network => 20,
:quota_subnet => 20, :quota_subnet => 20,
:quota_port => 100, :quota_port => 100,
@@ -45,6 +48,7 @@ describe 'neutron::quota' do
:quota_floatingip => 100, :quota_floatingip => 100,
:quota_security_group => 20, :quota_security_group => 20,
:quota_security_group_rule => 200, :quota_security_group_rule => 200,
:quota_driver => 'neutron.db.quota.driver.DbQuotaDriver',
:quota_rbac_policy => 10 :quota_rbac_policy => 10
}) })
end end