From 3c5f29c092e1b0e191c754bcf70f21a5fc47527c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 20 Mar 2022 23:57:04 +0900 Subject: [PATCH] Accept array for standalone_network_plugin_allowed_ip_ranges ... because this parameter is ListOpt which accepts a comma-separated strings. Change-Id: I1db1e4f64d97dea29f06745a1afc86eaa18de776 --- manifests/network/standalone.pp | 21 ++++++++++++------- .../defines/manila_network_standalone_spec.rb | 12 +++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/manifests/network/standalone.pp b/manifests/network/standalone.pp index f0c1d753..fe99d8a2 100644 --- a/manifests/network/standalone.pp +++ b/manifests/network/standalone.pp @@ -47,12 +47,19 @@ define manila::network::standalone ( $standalone_plugin_name = 'manila.network.standalone_network_plugin.StandaloneNetworkPlugin' manila_config { - "${name}/network_api_class": value => $standalone_plugin_name; - "${name}/standalone_network_plugin_gateway": value => $standalone_network_plugin_gateway; - "${name}/standalone_network_plugin_mask": value => $standalone_network_plugin_mask; - "${name}/standalone_network_plugin_segmentation_id": value => $standalone_network_plugin_segmentation_id; - "${name}/standalone_network_plugin_allowed_ip_ranges": value => $standalone_network_plugin_allowed_ip_ranges; - "${name}/network_plugin_ipv4_enabled": value => $network_plugin_ipv4_enabled; - "${name}/network_plugin_ipv6_enabled": value => $network_plugin_ipv6_enabled; + "${name}/network_api_class": + value => $standalone_plugin_name; + "${name}/standalone_network_plugin_gateway": + value => $standalone_network_plugin_gateway; + "${name}/standalone_network_plugin_mask": + value => $standalone_network_plugin_mask; + "${name}/standalone_network_plugin_segmentation_id": + value => $standalone_network_plugin_segmentation_id; + "${name}/standalone_network_plugin_allowed_ip_ranges": + value => join(any2array($standalone_network_plugin_allowed_ip_ranges), ','); + "${name}/network_plugin_ipv4_enabled": + value => $network_plugin_ipv4_enabled; + "${name}/network_plugin_ipv6_enabled": + value => $network_plugin_ipv6_enabled; } } diff --git a/spec/defines/manila_network_standalone_spec.rb b/spec/defines/manila_network_standalone_spec.rb index 6b1fa642..4dac45f7 100644 --- a/spec/defines/manila_network_standalone_spec.rb +++ b/spec/defines/manila_network_standalone_spec.rb @@ -52,6 +52,18 @@ describe 'manila::network::standalone' do .with_value(false) end end + + context 'with standalone_network_plugin_allowed_ip_ranges set by array' do + before do + params.merge!({ + :standalone_network_plugin_allowed_ip_ranges => ['10.0.0.10-10.0.0.20', '10.0.0.30-10.0.0.40'], + }) + end + it 'configures standalone network plugin' do + is_expected.to contain_manila_config('standalone/standalone_network_plugin_allowed_ip_ranges')\ + .with_value('10.0.0.10-10.0.0.20,10.0.0.30-10.0.0.40') + end + end end on_supported_os({