From 8a8d9255315b4675ea2a65f0bc3e2aea4cd6ca3b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 4 May 2024 14:21:57 +0900 Subject: [PATCH] Validate more options Some of the config options were not asserted in unit tests. Improve the coverage to catch any regressions. Change-Id: Ia8a86d77692aed575daba1a82d9f40ece27e0220 --- .../classes/neutron_agents_ml2_networking_baremetal_spec.rb | 1 + spec/classes/neutron_agents_ml2_ovn_spec.rb | 6 ++++++ spec/classes/neutron_agents_ovn_metadata_spec.rb | 3 +++ spec/classes/neutron_plugins_ml2_ovn_spec.rb | 4 ++++ spec/classes/neutron_quota_spec.rb | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb index 0605917d2..25fef14be 100644 --- a/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb +++ b/spec/classes/neutron_agents_ml2_networking_baremetal_spec.rb @@ -40,6 +40,7 @@ describe 'neutron::agents::ml2::networking_baremetal' do should contain_ironic_neutron_agent_config('ironic/cafile').with_value('') should contain_ironic_neutron_agent_config('ironic/certfile').with_value('') should contain_ironic_neutron_agent_config('ironic/keyfile').with_value('') + should contain_ironic_neutron_agent_config('ironic/insecure').with_value('') 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/user_domain_name').with_value(p[:user_domain_name]) diff --git a/spec/classes/neutron_agents_ml2_ovn_spec.rb b/spec/classes/neutron_agents_ml2_ovn_spec.rb index 756a0b6f9..841d086c6 100644 --- a/spec/classes/neutron_agents_ml2_ovn_spec.rb +++ b/spec/classes/neutron_agents_ml2_ovn_spec.rb @@ -45,7 +45,13 @@ describe 'neutron::agents::ml2::ovn' do should contain_neutron_agent_ovn('ovs/ovsdb_connection_timeout').with(:value => '') should contain_neutron_agent_ovn('ovn/ovsdb_connection_timeout').with(:value => '') should contain_neutron_agent_ovn('ovn/ovn_nb_connection').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_nb_private_key').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_nb_certificate').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_nb_ca_cert').with(:value => '') should contain_neutron_agent_ovn('ovn/ovn_sb_connection').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_sb_private_key').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_sb_certificate').with(:value => '') + should contain_neutron_agent_ovn('ovn/ovn_sb_ca_cert').with(:value => '') should contain_neutron_agent_ovn('ovn/ovsdb_retry_max_interval').with(:value => '') should contain_neutron_agent_ovn('ovn/ovsdb_probe_interval').with(:value => '') end diff --git a/spec/classes/neutron_agents_ovn_metadata_spec.rb b/spec/classes/neutron_agents_ovn_metadata_spec.rb index 19c5707a1..ed6863285 100644 --- a/spec/classes/neutron_agents_ovn_metadata_spec.rb +++ b/spec/classes/neutron_agents_ovn_metadata_spec.rb @@ -59,6 +59,9 @@ describe 'neutron::agents::ovn_metadata' do should contain_ovn_metadata_agent_config('ovs/ovsdb_connection_timeout').with(:value => '') 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 => '') + should contain_ovn_metadata_agent_config('ovn/ovn_sb_private_key').with(:value => '') + should contain_ovn_metadata_agent_config('ovn/ovn_sb_certificate').with(:value => '') + should contain_ovn_metadata_agent_config('ovn/ovn_sb_ca_cert').with(:value => '') should contain_ovn_metadata_agent_config('ovn/ovsdb_retry_max_interval').with(:value => '') should contain_ovn_metadata_agent_config('ovn/ovsdb_probe_interval').with(:value => '') end diff --git a/spec/classes/neutron_plugins_ml2_ovn_spec.rb b/spec/classes/neutron_plugins_ml2_ovn_spec.rb index 30acaa872..6b0c31e8a 100644 --- a/spec/classes/neutron_plugins_ml2_ovn_spec.rb +++ b/spec/classes/neutron_plugins_ml2_ovn_spec.rb @@ -23,6 +23,7 @@ describe 'neutron::plugins::ml2::ovn' do :ovsdb_retry_max_interval => '', :ovsdb_probe_interval => '', :neutron_sync_mode => '', + :ovn_metadata_enabled => '', :dvr_enabled => '', :disable_ovn_dhcp_for_baremetal_ports => '', :dns_servers => '', @@ -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_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/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/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]) @@ -102,6 +104,7 @@ describe 'neutron::plugins::ml2::ovn' do :ovsdb_retry_max_interval => 180, :ovsdb_probe_interval => 60000, :neutron_sync_mode => 'log', + :ovn_metadata_enabled => true, :dvr_enabled => false, :disable_ovn_dhcp_for_baremetal_ports => false, :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_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/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/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]) diff --git a/spec/classes/neutron_quota_spec.rb b/spec/classes/neutron_quota_spec.rb index 2686b013d..38bd23483 100644 --- a/spec/classes/neutron_quota_spec.rb +++ b/spec/classes/neutron_quota_spec.rb @@ -7,6 +7,7 @@ describe 'neutron::quota' do let :default_params do { + :default_quota => '', :quota_network => '', :quota_subnet => '', :quota_port => '', @@ -14,6 +15,7 @@ describe 'neutron::quota' do :quota_floatingip => '', :quota_security_group => '', :quota_security_group_rule => '', + :quota_driver => '', :quota_rbac_policy => '', } end @@ -38,6 +40,7 @@ describe 'neutron::quota' do context 'with provided parameters' do before do params.merge!({ + :default_quota => -1, :quota_network => 20, :quota_subnet => 20, :quota_port => 100, @@ -45,6 +48,7 @@ describe 'neutron::quota' do :quota_floatingip => 100, :quota_security_group => 20, :quota_security_group_rule => 200, + :quota_driver => 'neutron.db.quota.driver.DbQuotaDriver', :quota_rbac_policy => 10 }) end