openstack/manila
Code Issues Proposed changes

Migrate grenade resources.sh from manila CLI to openstack CLI

Browse Source 
The manila CLI has been removed. Migrate the grenade upgrade
test script to use the openstack share CLI instead.

The quota scenario now creates a real Keystone project since
'openstack share quota' resolves projects via Keystone, unlike
the old 'manila quota-show --tenant-id'. Line lengths were also
fixed to stay within 79 characters where possible.

Closes-Bug: #2146487
Depends-On: I229a46393ed956ff9fb4c823e0054a75b510d2de
Change-Id: I4b5e63fce66d8119c1d94e8a98b2f00aebc6b029
Assisted-By: Claude Opus 4.6
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
Goutham Pacha Ravi
2026-03-20 23:26:34 -07:00
parent f70806e586
commit 39c36f1760
1 changed files with 157 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devstack/upgrade/resources.sh
+157 -100
View File
@@ -43,15 +43,18 @@ MANILA_CONF=$MANILA_CONF_DIR/manila.conf
function scenario_1_do_share_with_rules_and_metadata {
# NOTE(vponomaryov): nova-network with DHSS=True drivers is not supported
# by this scenario.
enabled_share_backends=$(iniget $MANILA_CONF DEFAULT enabled_share_backends)
enabled_share_backends=$(iniget $MANILA_CONF \
DEFAULT enabled_share_backends)
backend=$( echo $enabled_share_backends | cut -d',' -f 1 )
enabled_share_protocols=$(iniget $MANILA_CONF DEFAULT enabled_share_protocols)
enabled_share_protocols=$(iniget $MANILA_CONF \
DEFAULT enabled_share_protocols)
share_protocol=$( echo $enabled_share_protocols | cut -d',' -f 1 )
driver_handles_share_servers=$(iniget $MANILA_CONF $backend driver_handles_share_servers)
driver_handles_share_servers=$(iniget $MANILA_CONF \
$backend driver_handles_share_servers)
create_share_cmd="manila create $share_protocol 1 "
create_share_cmd="openstack share create $share_protocol 1 "
create_share_cmd+="--share-type $MANILA_GRENADE_SHARE_TYPE_NAME "
create_share_cmd+="--name $MANILA_GRENADE_SHARE_NAME"
@@ -60,19 +63,23 @@ function scenario_1_do_share_with_rules_and_metadata {
if [[ $(trueorfalse False driver_handles_share_servers) == True ]]; then
share_driver=$(iniget $MANILA_CONF $backend share_driver)
generic_driver='manila.share.drivers.generic.GenericShareDriver'
windows_driver='manila.share.drivers.windows.windows_smb_driver.WindowsSMBDriver'
windows_driver='manila.share.drivers.windows'
windows_driver+='.windows_smb_driver.WindowsSMBDriver'
network_plugin=$(iniget $MANILA_CONF $backend network_plugin)
share_network_cmd="manila share-network-create "
share_network_cmd="openstack share network create "
share_network_cmd+="--name $MANILA_GRENADE_SHARE_NETWORK_NAME"
if is_service_enabled neutron; then
if [[ $share_driver == $generic_driver || \
$share_driver == $windows_driver || \
! $network_plugin =~ 'Single' || \
! $network_plugin =~ 'Standalone' ]]; then
net_id=$(openstack network show $MANILA_GRENADE_NETWORK_NAME -c id -f value)
subnet_id=$(openstack subnet show $MANILA_GRENADE_SUBNET_NAME -c id -f value)
share_network_cmd+=" --neutron-net $net_id --neutron-subnet $subnet_id"
net_id=$(openstack network show \
$MANILA_GRENADE_NETWORK_NAME -c id -f value)
subnet_id=$(openstack subnet show \
$MANILA_GRENADE_SUBNET_NAME -c id -f value)
share_network_cmd+=" --neutron-net-id $net_id"
share_network_cmd+=" --neutron-subnet-id $subnet_id"
fi
else
echo 'Neutron service is disabled, creating empty share-network'
@@ -87,13 +94,17 @@ function scenario_1_do_share_with_rules_and_metadata {
eval $share_network_cmd
# Create share-type
manila type-create \
openstack share type create \
$MANILA_GRENADE_SHARE_TYPE_NAME \
$driver_handles_share_servers \
--snapshot_support $MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--create_share_from_snapshot_support $MANILA_GRENADE_SHARE_TYPE_CREATE_SHARE_FROM_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--revert_to_snapshot_support $MANILA_GRENADE_SHARE_TYPE_REVERT_TO_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--mount_snapshot_support $MANILA_GRENADE_SHARE_TYPE_MOUNT_SNAPSHOT_SUPPORT_EXTRA_SPEC
--snapshot-support \
$MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--create-share-from-snapshot-support \
$MANILA_GRENADE_SHARE_TYPE_CREATE_SHARE_FROM_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--revert-to-snapshot-support \
$MANILA_GRENADE_SHARE_TYPE_REVERT_TO_SNAPSHOT_SUPPORT_EXTRA_SPEC \
--mount-snapshot-support \
$MANILA_GRENADE_SHARE_TYPE_MOUNT_SNAPSHOT_SUPPORT_EXTRA_SPEC
# Create share
eval $create_share_cmd
@@ -102,8 +113,8 @@ function scenario_1_do_share_with_rules_and_metadata {
wait_timeout=$MANILA_GRENADE_WAIT_TIMEOUT
available='false'
while (( wait_timeout > 0 )) ; do
current_status=$( manila show $MANILA_GRENADE_SHARE_NAME | \
grep " status " | get_field 2 )
current_status=$( openstack share show $MANILA_GRENADE_SHARE_NAME \
-c status -f value )
if [[ $current_status == 'available' ]]; then
available='true'
break
@@ -123,25 +134,27 @@ function scenario_1_do_share_with_rules_and_metadata {
fi
# grab the export location
export_path=$(manila share-export-location-list \
$MANILA_GRENADE_SHARE_NAME | grep ":/" | \
cut -d "|" -f 3 | head -1)
export_path=$(openstack share export location list \
$MANILA_GRENADE_SHARE_NAME -c Path -f value | head -1)
resource_save manila export_path $export_path
# Create some metadata
manila metadata $MANILA_GRENADE_SHARE_NAME set gre=nade
openstack share set --property gre=nade $MANILA_GRENADE_SHARE_NAME
# Add access rules
manila access-allow $MANILA_GRENADE_SHARE_NAME \
openstack share access create $MANILA_GRENADE_SHARE_NAME \
$MANILA_GRENADE_ACCESS_TYPE $MANILA_GRENADE_ACCESS_TO
# Wait for access rule creation results
wait_timeout=$MANILA_GRENADE_WAIT_TIMEOUT
active='false'
while (( wait_timeout > 0 )) ; do
current_state=$( manila access-list $MANILA_GRENADE_SHARE_NAME | \
grep " $MANILA_GRENADE_ACCESS_TO " | get_field 5 )
current_state=$( openstack share access list \
$MANILA_GRENADE_SHARE_NAME \
--access-type $MANILA_GRENADE_ACCESS_TYPE \
--access-to $MANILA_GRENADE_ACCESS_TO \
-c state -f value )
case $current_state in
active)
active='true'
@@ -163,33 +176,34 @@ function scenario_1_do_share_with_rules_and_metadata {
}
function scenario_1_verify_share_with_rules_and_metadata {
share_status=$(manila show $MANILA_GRENADE_SHARE_NAME | \
grep " status " | get_field 2)
share_status=$(openstack share show $MANILA_GRENADE_SHARE_NAME \
-c status -f value)
if [[ $share_status != "available" ]]; then
die $LINENO "Share status is not 'available'. It is $share_status"
fi
rule_state=$(manila access-list $MANILA_GRENADE_SHARE_NAME | \
grep " $MANILA_GRENADE_ACCESS_TO " | get_field 5)
rule_state=$(openstack share access list $MANILA_GRENADE_SHARE_NAME \
--access-type $MANILA_GRENADE_ACCESS_TYPE \
--access-to $MANILA_GRENADE_ACCESS_TO -c state -f value)
if [[ $rule_state != "active" ]]; then
die $LINENO "Share rule state is not 'active'. It is $rule_state"
fi
metadata=$(manila metadata-show $MANILA_GRENADE_SHARE_NAME | \
grep 'gre' | get_field 2)
if [[ $metadata != "nade" ]]; then
die $LINENO "Share metadata is not 'gre=nade'. It is gre=$metadata"
properties=$(openstack share show $MANILA_GRENADE_SHARE_NAME \
-c properties -f value)
if [[ $properties != *"'gre': 'nade'"* ]]; then
die $LINENO "Share metadata is not 'gre=nade'. Properties: $properties"
fi
}
function scenario_1_destroy_share_with_rules_and_metadata {
manila delete $MANILA_GRENADE_SHARE_NAME
openstack share delete $MANILA_GRENADE_SHARE_NAME
wait_timeout=$MANILA_GRENADE_WAIT_TIMEOUT
found='true'
while (( wait_timeout > 0 )) ; do
share_status=$( manila list --columns id,name,status | \
grep $MANILA_GRENADE_SHARE_NAME | get_field 3)
share_status=$( openstack share show $MANILA_GRENADE_SHARE_NAME \
-c status -f value 2>/dev/null || true )
if [[ -z $share_status ]]; then
found='false'
break
@@ -210,16 +224,16 @@ function scenario_1_destroy_share_with_rules_and_metadata {
share_network=$(resource_get manila share_network)
if [[ -n $share_network && $share_network != 'None' ]]; then
manila share-network-delete $MANILA_GRENADE_SHARE_NETWORK_NAME
openstack share network delete $MANILA_GRENADE_SHARE_NETWORK_NAME
fi
manila type-delete $MANILA_GRENADE_SHARE_TYPE_NAME
openstack share type delete $MANILA_GRENADE_SHARE_TYPE_NAME
}
#####
function scenario_2_do_attach_ss_to_sn {
manila security-service-create \
openstack share security service create \
ldap \
--name fake_ss_name \
--description fake_ss_description \
@@ -229,18 +243,27 @@ function scenario_2_do_attach_ss_to_sn {
--user fake_user \
--password fake_password
manila share-network-create \
net_id=$(openstack network show \
$MANILA_GRENADE_NETWORK_NAME -c id -f value)
subnet_id=$(openstack subnet show \
$MANILA_GRENADE_SUBNET_NAME -c id -f value)
resource_save manila fake_sn_net_id $net_id
resource_save manila fake_sn_subnet_id $subnet_id
openstack share network create \
--name fake_sn_name \
--description fake_sn_description \
--neutron-net-id fake_net \
--neutron-subnet-id fake_subnet
--neutron-net-id $net_id \
--neutron-subnet-id $subnet_id
manila share-network-security-service-add fake_sn_name fake_ss_name
openstack share network set fake_sn_name \
--new-security-service fake_ss_name
}
function scenario_2_verify_attach_ss_to_sn {
attached_security_service=$(\
manila share-network-security-service-list fake_sn_name | \
openstack share security service list \
--share-network fake_sn_name -c Name -f value | \
grep "fake_ss_name")
if [[ -z $attached_security_service ]] ; then
die $LINENO "Security service 'fake_ss_name' is not attached "\
@@ -248,83 +271,103 @@ function scenario_2_verify_attach_ss_to_sn {
fi
function assert {
actual=$(manila $1 $2 | grep " $3 " | get_field 2)
actual=$(openstack $1 $2 -c $3 -f value)
if [[ $actual != $4 ]]; then
die $LINENO "Field $3 for command $1 with arg $2 has "\
"value $actual, but $4 is expected."
fi
}
assert share-network-show fake_sn_name description fake_sn_description
expected_net_id=$(resource_get manila fake_sn_net_id)
expected_subnet_id=$(resource_get manila fake_sn_subnet_id)
assert "share network show" fake_sn_name description fake_sn_description
# From API version 2.51, share-network-show command doesn't have
# neutron_net_id and neutron_subnet_id, that information is in
# "share-network-subnets"
assert "--os-share-api-version 2.50 share-network-show" fake_sn_name neutron_net_id fake_net
assert "--os-share-api-version 2.50 share-network-show" fake_sn_name neutron_subnet_id fake_subnet
assert "--os-share-api-version 2.50 share network show" \
fake_sn_name neutron_net_id $expected_net_id
assert "--os-share-api-version 2.50 share network show" \
fake_sn_name neutron_subnet_id $expected_subnet_id
share_network_subnets=$(manila share-network-show fake_sn_name | grep share_network_subnets)
if [[ ! -z "$share_network_subnets" ]]; then
neutron_net_id=$(echo $share_network_subnets | tr ',' '\n' | grep neutron_net_id | cut -d "'" -f4)
neutron_subnet_id=$(echo $share_network_subnets | tr ',' '\n' | grep neutron_subnet_id | cut -d "'" -f4)
share_network_subnets=$(openstack share network show fake_sn_name \
-c share_network_subnets -f value)
if [[ -n "$share_network_subnets" \
&& "$share_network_subnets" != "[]" ]]; then
neutron_net_id=$(echo $share_network_subnets \
| tr ',' '\n' | grep neutron_net_id \
| cut -d "'" -f4)
neutron_subnet_id=$(echo $share_network_subnets \
| tr ',' '\n' | grep neutron_subnet_id \
| cut -d "'" -f4)
if [[ $neutron_net_id != fake_net ]]; then
die $LINENO "Neutron net ID for share network isn't fake_net, it is $neutron_net_id"
if [[ $neutron_net_id != $expected_net_id ]]; then
die $LINENO "Neutron net ID for share network" \
"isn't $expected_net_id, it is $neutron_net_id"
fi
if [[ $neutron_subnet_id != fake_subnet ]]; then
die $LINENO "Neutron subnet ID for share network isn't fake_subnet, it is $neutron_subnet_id"
if [[ $neutron_subnet_id != $expected_subnet_id ]]; then
die $LINENO "Neutron subnet ID for share network" \
"isn't $expected_subnet_id," \
"it is $neutron_subnet_id"
fi
fi
assert security-service-show fake_ss_name description fake_ss_description
assert security-service-show fake_ss_name dns_ip fake_dns_ip
assert security-service-show fake_ss_name server fake_server
assert security-service-show fake_ss_name domain fake_domain
assert security-service-show fake_ss_name user fake_user
assert security-service-show fake_ss_name password fake_password
assert "share security service show" \
fake_ss_name description fake_ss_description
assert "share security service show" fake_ss_name dns_ip fake_dns_ip
assert "share security service show" fake_ss_name server fake_server
assert "share security service show" fake_ss_name domain fake_domain
assert "share security service show" fake_ss_name user fake_user
assert "share security service show" fake_ss_name password fake_password
}
function scenario_2_destroy_attach_ss_to_sn {
manila share-network-delete fake_sn_name
manila security-service-delete fake_ss_name
openstack share network delete fake_sn_name
openstack share security service delete fake_ss_name
}
#####
function scenario_3_do_quotas {
current_shares_quota=$(manila quota-show --tenant fake | \
grep " shares " | get_field 2)
# Create a real project for quota testing since
# 'openstack share quota' resolves via Keystone
openstack project create manila_grenade_quota_project
current_shares_quota=$(openstack share quota show \
manila_grenade_quota_project -c shares -f value)
((new_shares_quota=$current_shares_quota + 5))
manila quota-update fake --shares $new_shares_quota
openstack share quota set manila_grenade_quota_project \
--shares $new_shares_quota
resource_save manila quota $new_shares_quota
}
function scenario_3_verify_quotas {
shares_quota=$(manila quota-show --tenant fake | \
grep " shares " | get_field 2)
shares_quota=$(openstack share quota show \
manila_grenade_quota_project -c shares -f value)
expected=$(resource_get manila quota)
if [[ $shares_quota != $expected ]] ; then
die $LINENO "Shares quota for 'fake' tenant is expected "\
"as $expected but it is $shares_quota."
die $LINENO "Shares quota is expected " \
"as $expected but it is $shares_quota."
fi
}
function scenario_3_destroy_quotas {
manila quota-delete --tenant fake
openstack share quota delete manila_grenade_quota_project
openstack project delete manila_grenade_quota_project
}
#####
function scenario_4_do_private_share_types {
manila type-create ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 false \
--is-public false
manila type-access-add ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 \
openstack share type create ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 \
false --public false
openstack share type access create \
${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 \
$(openstack project show demo -c id -f value)
}
function scenario_4_verify_private_share_types {
share_type_visibility=$(manila type-list --all \
--columns name,visibility | \
grep ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 | get_field 2)
share_type_visibility=$(openstack share type show \
${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 -c visibility -f value)
if [[ $share_type_visibility != 'private' ]] ; then
die $LINENO "Visibility of share type "\
"${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 is not "\
@@ -332,8 +375,9 @@ function scenario_4_verify_private_share_types {
fi
project_id=$(openstack project show demo -c id -f value)
access=$(manila type-access-list \
${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 | grep $project_id)
access=$(openstack share type access list \
${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 \
-c "Project ID" -f value | grep $project_id)
if [[ -z $access ]]; then
die $LINENO "Expected $project_id project ID is not found in list "\
"of allowed projects of "\
@@ -342,15 +386,16 @@ function scenario_4_verify_private_share_types {
}
function scenario_4_destroy_private_share_types {
manila type-delete ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4
openstack share type delete ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4
}
#####
function scenario_5_do_share_snapshot {
if [[ $(trueorfalse True MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC) == True ]]; then
snapshot_support=$MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC
if [[ $(trueorfalse True snapshot_support) == True ]]; then
# Create share snapshot
manila snapshot-create $MANILA_GRENADE_SHARE_NAME \
openstack share snapshot create $MANILA_GRENADE_SHARE_NAME \
--name $MANILA_GRENADE_SHARE_SNAPSHOT_NAME
resource_save manila share_snapshot $MANILA_GRENADE_SHARE_SNAPSHOT_NAME
@@ -358,8 +403,9 @@ function scenario_5_do_share_snapshot {
wait_timeout=$MANILA_GRENADE_WAIT_TIMEOUT
available='false'
while (( wait_timeout > 0 )) ; do
current_status=$( manila snapshot-show $MANILA_GRENADE_SHARE_SNAPSHOT_NAME | \
grep " status " | get_field 2 )
current_status=$( openstack share snapshot show \
$MANILA_GRENADE_SHARE_SNAPSHOT_NAME \
-c status -f value )
if [[ $current_status == 'available' ]]; then
available='true'
break
@@ -383,45 +429,53 @@ function scenario_5_do_share_snapshot {
}
function scenario_5_verify_share_snapshot {
if [[ $(trueorfalse True MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC) == True ]]; then
snapshot_support=$MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC
if [[ $(trueorfalse True snapshot_support) == True ]]; then
# Check that source share ID is set
share_id_in_snapshot=$( manila snapshot-show \
share_id_in_snapshot=$( openstack share snapshot show \
$MANILA_GRENADE_SHARE_SNAPSHOT_NAME \
| grep "| share_id " | get_field 2 )
-c share_id -f value )
if [[ -z $share_id_in_snapshot ]]; then
die $LINENO "Source share ID is not set."
fi
# Check that snapshot's source share ID is correct
share_id=$( manila show $MANILA_GRENADE_SHARE_NAME \
| grep "| id " | get_field 2 )
share_id=$( openstack share show $MANILA_GRENADE_SHARE_NAME \
-c id -f value )
if [[ $share_id != $share_id_in_snapshot ]]; then
die $LINENO "Actual source share ID '$share_id_in_snapshot' is not "\
"equal to expected value '$share_id'."
die $LINENO "Actual source share ID " \
"'$share_id_in_snapshot' is not " \
"equal to expected '$share_id'."
fi
# Check presence of expected columns in snapshot view
snapshot_output=$( manila snapshot-show $MANILA_GRENADE_SHARE_SNAPSHOT_NAME )
for snapshot_column in 'id' 'provider_location' 'name' 'size' 'export_locations'; do
snapshot_output=$( openstack share snapshot show \
$MANILA_GRENADE_SHARE_SNAPSHOT_NAME )
snapshot_cols="id provider_location name size"
snapshot_cols+=" export_locations"
for snapshot_column in $snapshot_cols; do
echo $snapshot_output | grep "| $snapshot_column "
if [[ $? != 0 ]]; then
die $LINENO "'$snapshot_column' column was not found in output '$snapshot_output'"
die $LINENO "'$snapshot_column' column" \
"not found in '$snapshot_output'"
fi
done
fi
}
function scenario_5_destroy_share_snapshot {
if [[ $(trueorfalse True MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC) == True ]]; then
manila snapshot-delete $MANILA_GRENADE_SHARE_SNAPSHOT_NAME
snapshot_support=$MANILA_GRENADE_SHARE_TYPE_SNAPSHOT_SUPPORT_EXTRA_SPEC
if [[ $(trueorfalse True snapshot_support) == True ]]; then
openstack share snapshot delete $MANILA_GRENADE_SHARE_SNAPSHOT_NAME
wait_timeout=$MANILA_GRENADE_WAIT_TIMEOUT
found='true'
while (( wait_timeout > 0 )) ; do
snapshot_status=$( manila snapshot-list --columns id,name,status | \
grep $MANILA_GRENADE_SHARE_SNAPSHOT_NAME | get_field 3)
snapshot_status=$( openstack share snapshot show \
$MANILA_GRENADE_SHARE_SNAPSHOT_NAME \
-c status -f value 2>/dev/null || true )
if [[ -z $snapshot_status ]]; then
found='false'
break
@@ -448,7 +502,8 @@ function scenario_6_do_share_mount_and_write_data {
mkdir -p /tmp/manila-share
export_path=$(resource_get manila export_path)
share_protocol=$(resource_get manila share_protocol| awk '{print tolower($0)}')
share_protocol=$(resource_get manila share_protocol \
| awk '{print tolower($0)}')
sudo mount -t $share_protocol $export_path /tmp/manila-share
test_msg="Hello from the past"
echo $test_msg | sudo tee /tmp/manila-share/testfile && sudo sync
@@ -457,13 +512,15 @@ function scenario_6_do_share_mount_and_write_data {
function scenario_6_verify_share_mount_and_read_data {
export_path=$(resource_get manila export_path)
share_is_mounted=$(sudo mount | grep $export_path)
[[ -z $share_is_mounted ]] && die $LINENO "Share $export_path is not mounted"
[[ -z $share_is_mounted ]] && \
die $LINENO "Share $export_path is not mounted"
read_data=$(sudo cat /tmp/manila-share/testfile|xargs)
if [[ $read_data == "Hello from the past" ]]; then
echo "Share data remains unmodified."
else
die $LINENO "Share data does not match what was written before upgrade."
die $LINENO "Share data does not match" \
"what was written before upgrade."
fi
}