Add Grenade support to Manila
Grenade is an OpenStack test harness to exercise the upgrade process between releases. It uses DevStack to perform an initial OpenStack install and as a reference for the final configuration. Add support of it to Manila project, doing following changes: - Add all required scripts for 'grenade' job, such as following: -- settings -- shutdown.sh -- upgrade.sh - Add optional 'resources.sh' script that performs functional tests using bash and manilaclient. List of scenarios: -- 1. create and delete share setting metadata and access rule -- 2. attach security service to share network -- 3. update quotas -- 4. create private share type and add access for project Note following: - Tempest is not used by design. - Manilaclient is used of stable version - version of 'base' devstack, which is 'stable/mitaka'. It also means that used API microversion is latest for that branch. Change-Id: I7d7e0c50933776ca1a710bcf069abb0282b821ac Depends-On: I4232382d3c944666bbf0916a3f285b84f6ff9d64 Implements blueprint grenade
This commit is contained in:
parent
95011c5876
commit
7999280fb9
|
@ -200,7 +200,7 @@ echo 'import pkg_resources; print list(pkg_resources.iter_entry_points("tempest.
|
||||||
# See bugs:
|
# See bugs:
|
||||||
# 1) https://bugs.launchpad.net/manila/+bug/1531049
|
# 1) https://bugs.launchpad.net/manila/+bug/1531049
|
||||||
# 2) https://bugs.launchpad.net/tempest/+bug/1524717
|
# 2) https://bugs.launchpad.net/tempest/+bug/1524717
|
||||||
TEMPEST_CONFIG=$BASE/new/tempest/etc/tempest.conf
|
TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf}
|
||||||
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
|
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
|
||||||
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
|
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
|
||||||
ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
|
ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
|
||||||
|
|
|
@ -663,10 +663,27 @@ function stop_manila {
|
||||||
# update_tempest - Function used for updating Tempest config if Tempest service enabled
|
# update_tempest - Function used for updating Tempest config if Tempest service enabled
|
||||||
function update_tempest {
|
function update_tempest {
|
||||||
if is_service_enabled tempest; then
|
if is_service_enabled tempest; then
|
||||||
|
TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf}
|
||||||
|
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
|
||||||
|
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
|
||||||
|
ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
|
||||||
|
|
||||||
if [ $(trueorfalse False MANILA_USE_SERVICE_INSTANCE_PASSWORD) == True ]; then
|
if [ $(trueorfalse False MANILA_USE_SERVICE_INSTANCE_PASSWORD) == True ]; then
|
||||||
iniset $TEMPEST_DIR/etc/tempest.conf share image_password $MANILA_SERVICE_INSTANCE_PASSWORD
|
iniset $TEMPEST_CONFIG share image_password $MANILA_SERVICE_INSTANCE_PASSWORD
|
||||||
fi
|
fi
|
||||||
iniset $TEMPEST_DIR/etc/tempest.conf share image_with_share_tools $MANILA_SERVICE_IMAGE_NAME
|
iniset $TEMPEST_CONFIG share image_with_share_tools $MANILA_SERVICE_IMAGE_NAME
|
||||||
|
iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"}
|
||||||
|
iniset $TEMPEST_CONFIG auth admin_password ${ADMIN_PASSWORD:-"secretadmin"}
|
||||||
|
iniset $TEMPEST_CONFIG auth admin_tenant_name $ADMIN_TENANT_NAME
|
||||||
|
iniset $TEMPEST_CONFIG auth admin_domain_name $ADMIN_DOMAIN_NAME
|
||||||
|
iniset $TEMPEST_CONFIG identity username ${TEMPEST_USERNAME:-"demo"}
|
||||||
|
iniset $TEMPEST_CONFIG identity password $ADMIN_PASSWORD
|
||||||
|
iniset $TEMPEST_CONFIG identity tenant_name ${TEMPEST_TENANT_NAME:-"demo"}
|
||||||
|
iniset $TEMPEST_CONFIG identity domain_name $ADMIN_DOMAIN_NAME
|
||||||
|
iniset $TEMPEST_CONFIG identity alt_username ${ALT_USERNAME:-"alt_demo"}
|
||||||
|
iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD
|
||||||
|
iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"}
|
||||||
|
iniset $TEMPEST_CONFIG identity alt_domain_name $ADMIN_DOMAIN_NAME
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,17 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# ``upgrade-manila``
|
||||||
|
|
||||||
|
function configure_manila_upgrade {
|
||||||
|
XTRACE=$(set +o | grep xtrace)
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Copy release-specific files
|
||||||
|
sudo cp -f $TARGET_RELEASE_DIR/manila/etc/manila/rootwrap.d/* $MANILA_CONF_DIR/rootwrap.d
|
||||||
|
sudo cp $TARGET_RELEASE_DIR/manila/etc/manila/api-paste.ini $MANILA_CONF_DIR/api-paste.ini
|
||||||
|
sudo cp $TARGET_RELEASE_DIR/manila/etc/manila/policy.json $MANILA_CONF_DIR/policy.json
|
||||||
|
sudo cp $TARGET_RELEASE_DIR/manila/etc/manila/rootwrap.conf $MANILA_CONF_DIR/rootwrap.conf
|
||||||
|
|
||||||
|
# reset to previous state
|
||||||
|
$XTRACE
|
||||||
|
}
|
|
@ -0,0 +1,356 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
source $GRENADE_DIR/grenaderc
|
||||||
|
source $GRENADE_DIR/functions
|
||||||
|
|
||||||
|
source $TOP_DIR/openrc admin demo
|
||||||
|
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
################################# Settings ####################################
|
||||||
|
|
||||||
|
# Access rules data specific to first enabled backend.
|
||||||
|
MANILA_GRENADE_ACCESS_TYPE=${MANILA_GRENADE_ACCESS_TYPE:-"ip"}
|
||||||
|
MANILA_GRENADE_ACCESS_TO=${MANILA_GRENADE_ACCESS_TO:-"127.0.0.1"}
|
||||||
|
|
||||||
|
# Network information that will be used in case DHSS=True driver is used
|
||||||
|
# with non-single-network-plugin.
|
||||||
|
MANILA_GRENADE_NETWORK_NAME=${MANILA_GRENADE_NETWORK_NAME:-"private"}
|
||||||
|
MANILA_GRENADE_SUBNET_NAME=${MANILA_GRENADE_SUBNET_NAME:-"private-subnet"}
|
||||||
|
|
||||||
|
# Timeout that will be used for share creation wait operation.
|
||||||
|
MANILA_GRENADE_WAIT_STEP=${MANILA_GRENADE_WAIT_STEP:-"4"}
|
||||||
|
MANILA_GRENADE_WAIT_TIMEOUT=${MANILA_GRENADE_WAIT_TIMEOUT:-"300"}
|
||||||
|
|
||||||
|
MANILA_GRENADE_SHARE_NETWORK_NAME=${MANILA_GRENADE_SHARE_NETWORK_NAME:-"manila_grenade_share_network"}
|
||||||
|
MANILA_GRENADE_SHARE_TYPE_NAME=${MANILA_GRENADE_SHARE_TYPE_NAME:-"manila_grenade_share_type"}
|
||||||
|
MANILA_GRENADE_SHARE_NAME=${MANILA_GRENADE_SHARE_NAME:-"manila_grenade_share"}
|
||||||
|
|
||||||
|
MANILA_CONF_DIR=${MANILA_CONF_DIR:-/etc/manila}
|
||||||
|
MANILA_CONF=$MANILA_CONF_DIR/manila.conf
|
||||||
|
|
||||||
|
################################ Scenarios ####################################
|
||||||
|
|
||||||
|
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)
|
||||||
|
backend=$( echo $enabled_share_backends | cut -d',' -f 1 )
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
create_share_cmd="manila create $share_protocol 1 "
|
||||||
|
create_share_cmd+="--share-type $MANILA_GRENADE_SHARE_TYPE_NAME "
|
||||||
|
create_share_cmd+="--name $MANILA_GRENADE_SHARE_NAME"
|
||||||
|
|
||||||
|
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'
|
||||||
|
network_plugin=$(iniget $MANILA_CONF $backend network_plugin)
|
||||||
|
|
||||||
|
share_network_cmd="manila share-network-create "
|
||||||
|
share_network_cmd+="--name $MANILA_GRENADE_SHARE_NETWORK_NAME"
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
create_share_cmd+=" --share-network $MANILA_GRENADE_SHARE_NETWORK_NAME"
|
||||||
|
resource_save manila share_network $MANILA_GRENADE_SHARE_NETWORK_NAME
|
||||||
|
else
|
||||||
|
resource_save manila share_network 'None'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create share-network
|
||||||
|
eval $share_network_cmd
|
||||||
|
|
||||||
|
# Create share-type
|
||||||
|
manila type-create $MANILA_GRENADE_SHARE_TYPE_NAME $driver_handles_share_servers
|
||||||
|
|
||||||
|
# Create share
|
||||||
|
eval $create_share_cmd
|
||||||
|
|
||||||
|
# Wait for share creation results
|
||||||
|
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 )
|
||||||
|
if [[ $current_status == 'available' ]]; then
|
||||||
|
available='true'
|
||||||
|
break
|
||||||
|
elif [[ $current_status == 'creating' ]]; then
|
||||||
|
((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
|
||||||
|
sleep $MANILA_GRENADE_WAIT_STEP
|
||||||
|
elif [[ $current_status == 'error' ]]; then
|
||||||
|
die $LINENO "Share failed to reach 'available' status."
|
||||||
|
else
|
||||||
|
die $LINENO "Should never reach this line."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ $available == 'true' ]]; then
|
||||||
|
echo "Share has been created successfully."
|
||||||
|
else
|
||||||
|
die $LINENO "Share timed out to reach 'available' status."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create some metadata
|
||||||
|
manila metadata $MANILA_GRENADE_SHARE_NAME set gre=nade
|
||||||
|
|
||||||
|
# Add access rules
|
||||||
|
manila access-allow $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 )
|
||||||
|
if [[ $current_state == 'active' ]]; then
|
||||||
|
active='true'
|
||||||
|
break
|
||||||
|
elif [[ $current_state == 'creating' || $current_state == 'new' ]]; then
|
||||||
|
((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
|
||||||
|
sleep $MANILA_GRENADE_WAIT_STEP
|
||||||
|
elif [[ $current_state == 'error' ]]; then
|
||||||
|
die $LINENO "Failed to create access rule."
|
||||||
|
else
|
||||||
|
die $LINENO "Should never reach this line."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ $active == 'true' ]]; then
|
||||||
|
echo "Access rule has been created successfully."
|
||||||
|
else
|
||||||
|
die $LINENO "Access rule timed out to reach 'active' state."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_1_verify_share_with_rules_and_metadata {
|
||||||
|
share_status=$(manila show $MANILA_GRENADE_SHARE_NAME | \
|
||||||
|
grep " status " | get_field 2)
|
||||||
|
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)
|
||||||
|
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"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_1_destroy_share_with_rules_and_metadata {
|
||||||
|
manila 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)
|
||||||
|
if [[ -z $share_status ]]; then
|
||||||
|
found='false'
|
||||||
|
break
|
||||||
|
elif [[ $share_status == 'deleting' ]]; then
|
||||||
|
((wait_timeout-=$MANILA_GRENADE_WAIT_STEP))
|
||||||
|
sleep $MANILA_GRENADE_WAIT_STEP
|
||||||
|
elif [[ $share_status == 'error_deleting' ]]; then
|
||||||
|
die $LINENO "Share failed to be deleted."
|
||||||
|
else
|
||||||
|
die $LINENO "Should never reach this line."
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ $found == 'true' ]]; then
|
||||||
|
die $LINENO "Share timed out to be deleted."
|
||||||
|
else
|
||||||
|
echo "Share has been deleted successfully."
|
||||||
|
fi
|
||||||
|
|
||||||
|
share_network=$(resource_get manila share_network)
|
||||||
|
if [[ -n $share_network && $share_network != 'None' ]]; then
|
||||||
|
manila share-network-delete $MANILA_GRENADE_SHARE_NETWORK_NAME
|
||||||
|
fi
|
||||||
|
|
||||||
|
manila type-delete $MANILA_GRENADE_SHARE_TYPE_NAME
|
||||||
|
}
|
||||||
|
|
||||||
|
#####
|
||||||
|
|
||||||
|
function scenario_2_do_attach_ss_to_sn {
|
||||||
|
manila security-service-create \
|
||||||
|
ldap \
|
||||||
|
--name fake_ss_name \
|
||||||
|
--description fake_ss_description \
|
||||||
|
--dns-ip fake_dns_ip \
|
||||||
|
--server fake_server \
|
||||||
|
--domain fake_domain \
|
||||||
|
--user fake_user \
|
||||||
|
--password fake_password
|
||||||
|
|
||||||
|
manila share-network-create \
|
||||||
|
--name fake_sn_name \
|
||||||
|
--description fake_sn_description \
|
||||||
|
--neutron-net-id fake_net \
|
||||||
|
--neutron-subnet-id fake_subnet
|
||||||
|
|
||||||
|
manila share-network-security-service-add fake_sn_name fake_ss_name
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_2_verify_attach_ss_to_sn {
|
||||||
|
attached_security_service=$(\
|
||||||
|
manila share-network-security-service-list fake_sn_name | \
|
||||||
|
grep "fake_ss_name")
|
||||||
|
if [[ -z $attached_security_service ]] ; then
|
||||||
|
die $LINENO "Security service 'fake_ss_name' is not attached "\
|
||||||
|
"to share-network 'fake_sn_name'."
|
||||||
|
fi
|
||||||
|
|
||||||
|
function assert {
|
||||||
|
actual=$(manila $1 $2 | grep " $3 " | get_field 2)
|
||||||
|
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
|
||||||
|
assert share-network-show fake_sn_name neutron_net_id fake_net
|
||||||
|
assert share-network-show fake_sn_name neutron_subnet_id fake_subnet
|
||||||
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_2_destroy_attach_ss_to_sn {
|
||||||
|
manila share-network-delete fake_sn_name
|
||||||
|
manila security-service-delete fake_ss_name
|
||||||
|
}
|
||||||
|
|
||||||
|
#####
|
||||||
|
|
||||||
|
function scenario_3_do_quotas {
|
||||||
|
current_shares_quota=$(manila quota-show --tenant fake | \
|
||||||
|
grep " shares " | get_field 2)
|
||||||
|
((new_shares_quota=$current_shares_quota + 5))
|
||||||
|
manila quota-update fake --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)
|
||||||
|
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."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_3_destroy_quotas {
|
||||||
|
manila quota-delete --tenant fake
|
||||||
|
}
|
||||||
|
|
||||||
|
#####
|
||||||
|
|
||||||
|
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 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)
|
||||||
|
if [[ $share_type_visibility != 'private' ]] ; then
|
||||||
|
die $LINENO "Visibility of share type "\
|
||||||
|
"${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 is not "\
|
||||||
|
"'private'. It is $share_type_visibility"
|
||||||
|
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)
|
||||||
|
if [[ -z $access ]]; then
|
||||||
|
die $LINENO "Expected $project_id project ID is not found in list "\
|
||||||
|
"of allowed projects of "\
|
||||||
|
"${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4 share type."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function scenario_4_destroy_private_share_types {
|
||||||
|
manila type-delete ${MANILA_GRENADE_SHARE_TYPE_NAME}_scenario4
|
||||||
|
}
|
||||||
|
|
||||||
|
################################# Main logic ##################################
|
||||||
|
|
||||||
|
function create {
|
||||||
|
scenario_1_do_share_with_rules_and_metadata
|
||||||
|
scenario_2_do_attach_ss_to_sn
|
||||||
|
scenario_3_do_quotas
|
||||||
|
scenario_4_do_private_share_types
|
||||||
|
echo "Manila 'create': SUCCESS"
|
||||||
|
}
|
||||||
|
|
||||||
|
function verify {
|
||||||
|
scenario_1_verify_share_with_rules_and_metadata
|
||||||
|
scenario_2_verify_attach_ss_to_sn
|
||||||
|
scenario_3_verify_quotas
|
||||||
|
scenario_4_verify_private_share_types
|
||||||
|
echo "Manila 'verify': SUCCESS"
|
||||||
|
}
|
||||||
|
|
||||||
|
function destroy {
|
||||||
|
scenario_1_destroy_share_with_rules_and_metadata
|
||||||
|
scenario_2_destroy_attach_ss_to_sn
|
||||||
|
scenario_3_destroy_quotas
|
||||||
|
scenario_4_destroy_private_share_types
|
||||||
|
echo "Manila 'destroy': SUCCESS"
|
||||||
|
}
|
||||||
|
|
||||||
|
function verify_noapi {
|
||||||
|
:
|
||||||
|
}
|
||||||
|
|
||||||
|
################################# Dispatcher ##################################
|
||||||
|
|
||||||
|
case $1 in
|
||||||
|
"create")
|
||||||
|
create
|
||||||
|
;;
|
||||||
|
"verify_noapi")
|
||||||
|
verify_noapi
|
||||||
|
;;
|
||||||
|
"verify")
|
||||||
|
verify
|
||||||
|
;;
|
||||||
|
"destroy")
|
||||||
|
destroy
|
||||||
|
;;
|
||||||
|
"force_destroy")
|
||||||
|
set +o errexit
|
||||||
|
destroy
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
###############################################################################
|
|
@ -0,0 +1,23 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
register_project_for_upgrade manila
|
||||||
|
register_db_to_save manila
|
||||||
|
|
||||||
|
BASE_RUN_SMOKE=False
|
||||||
|
TARGET_RUN_SMOKE=False
|
||||||
|
|
||||||
|
devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
|
||||||
|
devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/mitaka
|
||||||
|
devstack_localrc base MANILA_UI_ENABLED=False
|
||||||
|
devstack_localrc base OSLO_SERVICE_WORKS=True
|
||||||
|
|
||||||
|
# NOTE(vponomaryov): stable client is used for keeping scenarios stable
|
||||||
|
# so they are not broken by changed CLI view.
|
||||||
|
devstack_localrc base MANILACLIENT_BRANCH="stable/mitaka"
|
||||||
|
|
||||||
|
devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
|
||||||
|
devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila
|
||||||
|
devstack_localrc target MANILA_UI_ENABLED=False
|
||||||
|
devstack_localrc target OSLO_SERVICE_WORKS=True
|
||||||
|
devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
|
||||||
|
devstack_localrc target MANILACLIENT_BRANCH="stable/mitaka"
|
|
@ -0,0 +1,22 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
source $GRENADE_DIR/grenaderc
|
||||||
|
source $GRENADE_DIR/functions
|
||||||
|
|
||||||
|
source $BASE_DEVSTACK_DIR/functions
|
||||||
|
source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
|
||||||
|
|
||||||
|
# Locate the manila plugin and get its functions
|
||||||
|
MANILA_DEVSTACK_DIR=$(dirname $(dirname $0))
|
||||||
|
source $MANILA_DEVSTACK_DIR/plugin.sh
|
||||||
|
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
stop_manila
|
||||||
|
|
||||||
|
# Ensure everything is stopped
|
||||||
|
ensure_services_stopped manila-api manila-share manila-scheduler manila-data
|
|
@ -0,0 +1,73 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# ``upgrade-manila``
|
||||||
|
|
||||||
|
echo "*********************************************************************"
|
||||||
|
echo "Begin $0"
|
||||||
|
echo "*********************************************************************"
|
||||||
|
|
||||||
|
# Clean up any resources that may be in use
|
||||||
|
cleanup() {
|
||||||
|
set +o errexit
|
||||||
|
|
||||||
|
echo "*********************************************************************"
|
||||||
|
echo "ERROR: Abort $0"
|
||||||
|
echo "*********************************************************************"
|
||||||
|
|
||||||
|
# Kill ourselves to signal any calling process
|
||||||
|
trap 2; kill -2 $$
|
||||||
|
}
|
||||||
|
|
||||||
|
trap cleanup SIGHUP SIGINT SIGTERM
|
||||||
|
|
||||||
|
# Keep track of the grenade directory
|
||||||
|
RUN_DIR=$(cd $(dirname "$0") && pwd)
|
||||||
|
|
||||||
|
# Source params
|
||||||
|
source $GRENADE_DIR/grenaderc
|
||||||
|
|
||||||
|
# Import common functions
|
||||||
|
source $GRENADE_DIR/functions
|
||||||
|
|
||||||
|
# This script exits on an error so that errors don't compound and you see
|
||||||
|
# only the first error that occurred.
|
||||||
|
set -o errexit
|
||||||
|
|
||||||
|
# Upgrade Manila
|
||||||
|
# ==============
|
||||||
|
# Locate manila devstack plugin, the directory above the
|
||||||
|
# grenade plugin.
|
||||||
|
MANILA_DEVSTACK_DIR=$(dirname $(dirname $0))
|
||||||
|
|
||||||
|
# Get functions from current DevStack
|
||||||
|
source $TARGET_DEVSTACK_DIR/functions
|
||||||
|
source $TARGET_DEVSTACK_DIR/lib/tls
|
||||||
|
source $TARGET_DEVSTACK_DIR/stackrc
|
||||||
|
source $(dirname $(dirname $BASH_SOURCE))/settings
|
||||||
|
source $(dirname $(dirname $BASH_SOURCE))/plugin.sh
|
||||||
|
|
||||||
|
# Print the commands being run so that we can see the command that triggers
|
||||||
|
# an error. It is also useful for following allowing as the install occurs.
|
||||||
|
set -o xtrace
|
||||||
|
|
||||||
|
# Save current config files for posterity
|
||||||
|
[[ -d $SAVE_DIR/etc.manila ]] || cp -pr $MANILA_CONF_DIR $SAVE_DIR/etc.manila
|
||||||
|
|
||||||
|
# Install the target manila
|
||||||
|
install_manila
|
||||||
|
|
||||||
|
# calls upgrade-manila for specific release
|
||||||
|
upgrade_project manila $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
|
||||||
|
|
||||||
|
# Migrate the database
|
||||||
|
$MANILA_BIN_DIR/manila-manage db sync || die $LINENO "DB migration error"
|
||||||
|
|
||||||
|
start_manila
|
||||||
|
|
||||||
|
# Don't succeed unless the services come up
|
||||||
|
ensure_services_started manila-api manila-share manila-scheduler manila-data
|
||||||
|
|
||||||
|
set +o xtrace
|
||||||
|
echo "*********************************************************************"
|
||||||
|
echo "SUCCESS: End $0"
|
||||||
|
echo "*********************************************************************"
|
4
tox.ini
4
tox.ini
|
@ -39,6 +39,10 @@ commands =
|
||||||
contrib/ci/pre_test_hook.sh \
|
contrib/ci/pre_test_hook.sh \
|
||||||
contrib/ci/post_test_hook.sh \
|
contrib/ci/post_test_hook.sh \
|
||||||
devstack/plugin.sh \
|
devstack/plugin.sh \
|
||||||
|
devstack/upgrade/from-mitaka/upgrade-manila \
|
||||||
|
devstack/upgrade/resources.sh \
|
||||||
|
devstack/upgrade/shutdown.sh \
|
||||||
|
devstack/upgrade/upgrade.sh \
|
||||||
tools/cover.sh \
|
tools/cover.sh \
|
||||||
tools/check_logging.sh \
|
tools/check_logging.sh \
|
||||||
run_tests.sh
|
run_tests.sh
|
||||||
|
|
Loading…
Reference in New Issue