openstack
/
puppet-manila
Code Issues Proposed changes

Fix wrong parameter used to configure reserved_share_extend_percentage 

We should use the reserved_share_extend_percentage parameter, instead
of the reserved_share_percentage parameter, to configure the option.

Closes-Bug: #2058111
Change-Id: Ib224d0af5c9794c9c27573981f498cdd28dacc4a
This commit is contained in:
Takashi Kajinami 2024-03-17 00:40:02 +09:00
parent cfdb02ac4c
commit 59c444d7a4
24 changed files with 196 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/backend/cephfs.pp
View File

@ -131,6 +131,6 @@ define manila::backend::cephfs (
"${name}/cephfs_filesystem_name": value => $cephfs_filesystem_name;
"${name}/reserved_share_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
}

2
manifests/backend/dellemc_powermax.pp
View File

@ -124,7 +124,7 @@ define manila::backend::dellemc_powermax (
"${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

2
manifests/backend/dellemc_unity.pp
View File

@ -156,7 +156,7 @@ define manila::backend::dellemc_unity (
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

2
manifests/backend/dellemc_vnx.pp
View File

@ -147,7 +147,7 @@ define manila::backend::dellemc_vnx (
"${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

2
manifests/backend/flashblade.pp
View File

@ -82,7 +82,7 @@ define manila::backend::flashblade (
"${share_backend_name}/backend_availability_zone": value => $backend_availability_zone;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

2
manifests/backend/generic.pp
View File

@ -137,6 +137,6 @@ define manila::backend::generic (
"${name}/automatic_share_server_cleanup": value => $automatic_share_server_cleanup;
"${name}/reserved_share_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
}

2
manifests/backend/glusterfs.pp
View File

@ -65,6 +65,6 @@ define manila::backend::glusterfs (
"${name}/glusterfs_mount_point_base": value => $glusterfs_mount_point_base;
"${name}/reserved_share_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
}

2
manifests/backend/glusternative.pp
View File

@ -72,7 +72,7 @@ define manila::backend::glusternative (
"${share_backend_name}/glusterfs_volume_pattern": value => $glusterfs_volume_pattern;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages( [

2
manifests/backend/glusternfs.pp
View File

@ -83,7 +83,7 @@ define manila::backend::glusternfs (
"${share_backend_name}/glusterfs_ganesha_server_ip": value => $glusterfs_ganesha_server_ip;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages( [

2
manifests/backend/hitachi_hnas.pp
View File

@ -103,7 +103,7 @@ define manila::backend::hitachi_hnas (
"${share_backend_name}/hitachi_hnas_file_system_name": value => $hitachi_hnas_file_system_name;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

2
manifests/backend/lvm.pp
View File

@ -93,6 +93,6 @@ and has no effect.')
"${name}/lvm_share_helpers": value => join(any2array($lvm_share_helpers), ',');
"${name}/reserved_share_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
}

2
manifests/backend/netapp.pp
View File

@ -176,7 +176,7 @@ define manila::backend::netapp (
"${share_backend_name}/netapp_trace_flags": value => $netapp_trace_flags;
"${share_backend_name}/reserved_share_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_from_snapshot_percentage": value => $reserved_share_from_snapshot_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_percentage;
"${share_backend_name}/reserved_share_extend_percentage": value => $reserved_share_extend_percentage;
}
ensure_packages('nfs-client', {

35
spec/defines/manila_backend_cephfs_spec.rb
View File

@ -4,22 +4,26 @@ describe 'manila::backend::cephfs' do
shared_examples_for 'cephfs driver' do
let(:title) {'cephfs'}
let :params do
{
:driver_handles_share_servers => false,
:share_backend_name => 'cephfs',
:backend_availability_zone => 'my_zone',
:cephfs_conf_path => '$state_path/ceph.conf',
:cephfs_auth_id => 'manila',
:cephfs_cluster_name => 'ceph',
:cephfs_protocol_helper_type => 'NFS',
:cephfs_ganesha_server_ip => '10.0.0.1',
:cephfs_ganesha_export_ips => '10.0.0.1,1001::1001',
:cephfs_ganesha_server_is_remote => true,
:cephfs_ganesha_server_username => 'ganeshadmin',
:cephfs_ganesha_path_to_private_key => '/readable/by/manila.key',
:cephfs_volume_mode => '0775',
:cephfs_filesystem_name => 'cephfs',
:driver_handles_share_servers => false,
:share_backend_name => 'cephfs',
:backend_availability_zone => 'my_zone',
:cephfs_conf_path => '$state_path/ceph.conf',
:cephfs_auth_id => 'manila',
:cephfs_cluster_name => 'ceph',
:cephfs_protocol_helper_type => 'NFS',
:cephfs_ganesha_server_ip => '10.0.0.1',
:cephfs_ganesha_export_ips => '10.0.0.1,1001::1001',
:cephfs_ganesha_server_is_remote => true,
:cephfs_ganesha_server_username => 'ganeshadmin',
:cephfs_ganesha_path_to_private_key => '/readable/by/manila.key',
:cephfs_volume_mode => '0775',
:cephfs_filesystem_name => 'cephfs',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end
@ -52,6 +56,9 @@ describe 'manila::backend::cephfs' do
'/readable/by/manila.key')
is_expected.to contain_manila_config('cephfs/cephfs_filesystem_name').with_value(
'cephfs')
is_expected.to contain_manila_config('cephfs/reserved_share_percentage').with_value(10.0)
is_expected.to contain_manila_config('cephfs/reserved_share_from_snapshot_percentage').with_value(10.1)
is_expected.to contain_manila_config('cephfs/reserved_share_extend_percentage').with_value(10.2)
end
context 'with cephfs_ganesha_export_ips set by array' do

24
spec/defines/manila_backend_dellemc_powermax_spec.rb
View File

@ -14,11 +14,14 @@ describe 'manila::backend::dellemc_powermax' do
let :default_params do
{
:emc_share_backend => 'powermax',
:powermax_server_container => '<SERVICE DEFAULT>',
:powermax_share_data_pools => '<SERVICE DEFAULT>',
:powermax_ethernet_ports => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:emc_share_backend => 'powermax',
:powermax_server_container => '<SERVICE DEFAULT>',
:powermax_share_data_pools => '<SERVICE DEFAULT>',
:powermax_ethernet_ports => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:reserved_share_percentage => '<SERVICE DEFAULT>',
:reserved_share_from_snapshot_percentage => '<SERVICE DEFAULT>',
:reserved_share_extend_percentage => '<SERVICE DEFAULT>',
}
end
@ -53,10 +56,13 @@ describe 'manila::backend::dellemc_powermax' do
context 'with provided parameters' do
let :params do
required_params.merge!({
:powermax_server_container => 'container1',
:powermax_share_data_pools => '*',
:powermax_ethernet_ports => 'eth1',
:backend_availability_zone => 'my_zone',
:powermax_server_container => 'container1',
:powermax_share_data_pools => '*',
:powermax_ethernet_ports => 'eth1',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
})
end

40
spec/defines/manila_backend_dellemc_unity_spec.rb
View File

@ -16,15 +16,18 @@ describe 'manila::backend::dellemc_unity' do
let :default_params do
{
:emc_share_backend => 'unity',
:unity_share_data_pools => '<SERVICE DEFAULT>',
:unity_ethernet_ports => '<SERVICE DEFAULT>',
:unity_share_server => '<SERVICE DEFAULT>',
:report_default_filter_function => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:emc_share_backend => 'unity',
:unity_share_data_pools => '<SERVICE DEFAULT>',
:unity_ethernet_ports => '<SERVICE DEFAULT>',
:unity_share_server => '<SERVICE DEFAULT>',
:report_default_filter_function => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:reserved_share_percentage => '<SERVICE DEFAULT>',
:reserved_share_from_snapshot_percentage => '<SERVICE DEFAULT>',
:reserved_share_extend_percentage => '<SERVICE DEFAULT>',
}
end
@ -66,14 +69,17 @@ describe 'manila::backend::dellemc_unity' do
context 'with provided parameters' do
let :params do
required_params.merge({
:unity_share_data_pools => '*',
:unity_ethernet_ports => 'eth1',
:unity_share_server => '192.168.0.1',
:report_default_filter_function => false,
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
:unity_share_data_pools => '*',
:unity_ethernet_ports => 'eth1',
:unity_share_server => '192.168.0.1',
:report_default_filter_function => false,
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
})
end

36
spec/defines/manila_backend_dellemc_vnx_spec.rb
View File

@ -14,14 +14,17 @@ describe 'manila::backend::dellemc_vnx' do
let :default_params do
{
:emc_share_backend => 'vnx',
:vnx_server_container => '<SERVICE DEFAULT>',
:vnx_share_data_pools => '<SERVICE DEFAULT>',
:vnx_ethernet_ports => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:emc_share_backend => 'vnx',
:vnx_server_container => '<SERVICE DEFAULT>',
:vnx_share_data_pools => '<SERVICE DEFAULT>',
:vnx_ethernet_ports => '<SERVICE DEFAULT>',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => '<SERVICE DEFAULT>',
:emc_ssl_cert_path => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:reserved_share_percentage => '<SERVICE DEFAULT>',
:reserved_share_from_snapshot_percentage => '<SERVICE DEFAULT>',
:reserved_share_extend_percentage => '<SERVICE DEFAULT>',
}
end
@ -56,13 +59,16 @@ describe 'manila::backend::dellemc_vnx' do
context 'with provided parameters' do
let :params do
required_params.merge({
:vnx_server_container => 'container1',
:vnx_share_data_pools => '*',
:vnx_ethernet_ports => 'eth1',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
:vnx_server_container => 'container1',
:vnx_share_data_pools => '*',
:vnx_ethernet_ports => 'eth1',
:network_plugin_ipv6_enabled => true,
:emc_ssl_cert_verify => true,
:emc_ssl_cert_path => '/etc/ssl/certs/',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
})
end

14
spec/defines/manila_backend_flashblade_spec.rb
View File

@ -14,8 +14,11 @@ describe 'manila::backend::flashblade' do
let :default_params do
{
:flashblade_eradicate => true,
:backend_availability_zone => '<SERVICE DEFAULT>',
:flashblade_eradicate => true,
:backend_availability_zone => '<SERVICE DEFAULT>',
:reserved_share_percentage => '<SERVICE DEFAULT>',
:reserved_share_from_snapshot_percentage => '<SERVICE DEFAULT>',
:reserved_share_extend_percentage => '<SERVICE DEFAULT>',
}
end
@ -50,8 +53,11 @@ describe 'manila::backend::flashblade' do
context 'with share server config' do
let :params do
required_params.merge!({
:flashblade_eradicate => true,
:backend_availability_zone => 'my_zone',
:flashblade_eradicate => true,
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
})
end

25
spec/defines/manila_backend_generic_spec.rb
View File

@ -6,17 +6,20 @@ describe 'manila::backend::generic' do
let :params do
{
:driver_handles_share_servers => true,
:smb_template_config_path => '$state_path/smb.conf',
:volume_name_template => 'manila-share-%s',
:volume_snapshot_name_template => 'manila-snapshot-%s',
:share_mount_path => '/shares',
:max_time_to_create_volume => 180,
:max_time_to_attach => 120,
:service_instance_smb_config_path => '$share_mount_path/smb.conf',
:share_volume_fstype => 'ext4',
:cinder_volume_type => 'gold',
:backend_availability_zone => 'my_zone',
:driver_handles_share_servers => true,
:smb_template_config_path => '$state_path/smb.conf',
:volume_name_template => 'manila-share-%s',
:volume_snapshot_name_template => 'manila-snapshot-%s',
:share_mount_path => '/shares',
:max_time_to_create_volume => 180,
:max_time_to_attach => 120,
:service_instance_smb_config_path => '$share_mount_path/smb.conf',
:share_volume_fstype => 'ext4',
:cinder_volume_type => 'gold',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end

6
spec/defines/manila_backend_glusterfs_spec.rb
View File

@ -24,6 +24,12 @@ describe 'manila::backend::glusterfs' do
'$state_path/mnt')
is_expected.to contain_manila_config('mygluster/backend_availability_zone').with_value(
'my_zone')
is_expected.to contain_manila_config('mygluster/reserved_share_percentage').with_value(
'<SERVICE DEFAULT>')
is_expected.to contain_manila_config('mygluster/reserved_share_from_snapshot_percentage').with_value(
'<SERVICE DEFAULT>')
is_expected.to contain_manila_config('mygluster/reserved_share_extend_percentage').with_value(
'<SERVICE DEFAULT>')
end
end

11
spec/defines/manila_backend_glusternative_spec.rb
View File

@ -7,10 +7,13 @@ describe 'manila::backend::glusternative' do
let :params do
{
:glusterfs_servers => 'remoteuser@volserver',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_volume_pattern => 'manila-share-volume-\d+$',
:backend_availability_zone => 'my_zone',
:glusterfs_servers => 'remoteuser@volserver',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_volume_pattern => 'manila-share-volume-\d+$',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end

15
spec/defines/manila_backend_glusternfs_spec.rb
View File

@ -7,12 +7,15 @@ describe 'manila::backend::glusternfs' do
let :params do
{
:glusterfs_target => 'remoteuser@volserver:volid',
:glusterfs_mount_point_base => '$state_path/mnt',
:glusterfs_nfs_server_type => 'gluster',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_ganesha_server_ip => '127.0.0.1',
:backend_availability_zone => 'my_zone',
:glusterfs_target => 'remoteuser@volserver:volid',
:glusterfs_mount_point_base => '$state_path/mnt',
:glusterfs_nfs_server_type => 'gluster',
:glusterfs_path_to_private_key => '/etc/glusterfs/glusterfs.pem',
:glusterfs_ganesha_server_ip => '127.0.0.1',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end

19
spec/defines/manila_backend_hitachi_hnas_spec.rb
View File

@ -6,14 +6,17 @@ describe 'manila::backend::hitachi_hnas' do
let :params do
{
:driver_handles_share_servers => false,
:hitachi_hnas_ip => '172.24.44.15',
:hitachi_hnas_user => 'supervisor',
:hitachi_hnas_password => 'supervisor',
:hitachi_hnas_evs_id => '1',
:hitachi_hnas_evs_ip => ' 172.24.53.1',
:hitachi_hnas_file_system_name => 'FS-Manila',
:backend_availability_zone => 'my_zone',
:driver_handles_share_servers => false,
:hitachi_hnas_ip => '172.24.44.15',
:hitachi_hnas_user => 'supervisor',
:hitachi_hnas_password => 'supervisor',
:hitachi_hnas_evs_id => '1',
:hitachi_hnas_evs_ip => ' 172.24.53.1',
:hitachi_hnas_file_system_name => 'FS-Manila',
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end

21
spec/defines/manila_backend_lvm_spec.rb
View File

@ -7,12 +7,18 @@ describe 'manila::backend::lvm' do
let :params do
{
:lvm_share_export_ips => '1.2.3.4',
:lvm_share_export_root => '$state_path/mnt',
:lvm_share_mirrors => 1,
:lvm_share_volume_group => 'lvm-shares',
:lvm_share_helpers => ['CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess','NFS=manila.share.drivers.helpers.NFSHelper'],
:backend_availability_zone => 'my_zone',
:lvm_share_export_ips => '1.2.3.4',
:lvm_share_export_root => '$state_path/mnt',
:lvm_share_mirrors => 1,
:lvm_share_volume_group => 'lvm-shares',
:lvm_share_helpers => [
'CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess',
'NFS=manila.share.drivers.helpers.NFSHelper'
],
:backend_availability_zone => 'my_zone',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
}
end
@ -29,6 +35,9 @@ describe 'manila::backend::lvm' do
'CIFS=manila.share.drivers.helpers.CIFSHelperUserAccess,NFS=manila.share.drivers.helpers.NFSHelper')
is_expected.to contain_manila_config('mylvm/backend_availability_zone').with_value(
'my_zone')
is_expected.to contain_manila_config('mylvm/reserved_share_percentage').with_value(10.0)
is_expected.to contain_manila_config('mylvm/reserved_share_from_snapshot_percentage').with_value(10.1)
is_expected.to contain_manila_config('mylvm/reserved_share_extend_percentage').with_value(10.2)
end
end

58
spec/defines/manila_backend_netapp_spec.rb
View File

@ -15,19 +15,22 @@ describe 'manila::backend::netapp' do
let :default_params do
{
:backend_availability_zone => '<SERVICE DEFAULT>',
:netapp_transport_type => '<SERVICE DEFAULT>',
:netapp_storage_family => '<SERVICE DEFAULT>',
:netapp_server_port => '<SERVICE DEFAULT>',
:netapp_volume_name_template => '<SERVICE DEFAULT>',
:netapp_vserver => '<SERVICE DEFAULT>',
:netapp_vserver_name_template => '<SERVICE DEFAULT>',
:netapp_lif_name_template => '<SERVICE DEFAULT>',
:netapp_aggregate_name_search_pattern => '<SERVICE DEFAULT>',
:netapp_root_volume_aggregate => '<SERVICE DEFAULT>',
:netapp_root_volume => '<SERVICE DEFAULT>',
:netapp_port_name_search_pattern => '<SERVICE DEFAULT>',
:netapp_trace_flags => '<SERVICE DEFAULT>',
:backend_availability_zone => '<SERVICE DEFAULT>',
:netapp_transport_type => '<SERVICE DEFAULT>',
:netapp_storage_family => '<SERVICE DEFAULT>',
:netapp_server_port => '<SERVICE DEFAULT>',
:netapp_volume_name_template => '<SERVICE DEFAULT>',
:netapp_vserver => '<SERVICE DEFAULT>',
:netapp_vserver_name_template => '<SERVICE DEFAULT>',
:netapp_lif_name_template => '<SERVICE DEFAULT>',
:netapp_aggregate_name_search_pattern => '<SERVICE DEFAULT>',
:netapp_root_volume_aggregate => '<SERVICE DEFAULT>',
:netapp_root_volume => '<SERVICE DEFAULT>',
:netapp_port_name_search_pattern => '<SERVICE DEFAULT>',
:netapp_trace_flags => '<SERVICE DEFAULT>',
:reserved_share_percentage => '<SERVICE DEFAULT>',
:reserved_share_from_snapshot_percentage => '<SERVICE DEFAULT>',
:reserved_share_extend_percentage => '<SERVICE DEFAULT>',
}
end
@ -61,19 +64,22 @@ describe 'manila::backend::netapp' do
context 'with provided parameters' do
let :params do
req_params.merge({
:backend_availability_zone => 'my_zone',
:netapp_transport_type => 'https',
:netapp_storage_family => 'ontap_cluster',
:netapp_server_port => '443',
:netapp_volume_name_template => 'share_%(share_id)s',
:netapp_vserver => 'manilasvm',
:netapp_vserver_name_template => 'os_%s',
:netapp_lif_name_template => 'os_%(net_allocation_id)s',
:netapp_aggregate_name_search_pattern => '(.*)',
:netapp_root_volume_aggregate => 'aggr1',
:netapp_root_volume => 'rootvolume',
:netapp_port_name_search_pattern => '(.*)',
:netapp_trace_flags => 'method,api',
:backend_availability_zone => 'my_zone',
:netapp_transport_type => 'https',
:netapp_storage_family => 'ontap_cluster',
:netapp_server_port => '443',
:netapp_volume_name_template => 'share_%(share_id)s',
:netapp_vserver => 'manilasvm',
:netapp_vserver_name_template => 'os_%s',
:netapp_lif_name_template => 'os_%(net_allocation_id)s',
:netapp_aggregate_name_search_pattern => '(.*)',
:netapp_root_volume_aggregate => 'aggr1',
:netapp_root_volume => 'rootvolume',
:netapp_port_name_search_pattern => '(.*)',
:netapp_trace_flags => 'method,api',
:reserved_share_percentage => 10.0,
:reserved_share_from_snapshot_percentage => 10.1,
:reserved_share_extend_percentage => 10.2,
})
end