diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 8263e1a7..ea1f0c7a 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -104,15 +104,15 @@ function start_qinling { } -function stop_qingling { +function stop_qinling { local serv - for serv in qinling-api qingling-engine; do + for serv in qinling-api qinling-engine; do stop_process $serv done } -function cleanup_qingling { +function cleanup_qinling { sudo rm -rf $QINLING_AUTH_CACHE_DIR sudo rm -rf $QINLING_CONF_DIR } @@ -147,13 +147,13 @@ if is_service_enabled qinling; then fi if [[ "$1" == "unstack" ]]; then - echo_summary "Shutting down qingling" - stop_qingling + echo_summary "Shutting down qinling" + stop_qinling fi if [[ "$1" == "clean" ]]; then - echo_summary "Cleaning qingling" - cleanup_qingling + echo_summary "Cleaning qinling" + cleanup_qinling fi fi diff --git a/qinling_tempest_plugin/config.py b/qinling_tempest_plugin/config.py index ae422aad..fae32221 100644 --- a/qinling_tempest_plugin/config.py +++ b/qinling_tempest_plugin/config.py @@ -23,7 +23,7 @@ service_option = cfg.BoolOpt( ) -qingling_group = cfg.OptGroup(name="qingling", title="Qinling Service Options") +qinling_group = cfg.OptGroup(name="qinling", title="Qinling Service Options") QinlingGroup = [ cfg.StrOpt("region", diff --git a/qinling_tempest_plugin/plugin.py b/qinling_tempest_plugin/plugin.py index a614c35e..7c5ae9f6 100644 --- a/qinling_tempest_plugin/plugin.py +++ b/qinling_tempest_plugin/plugin.py @@ -36,13 +36,13 @@ class QinlingTempestPlugin(plugins.TempestPlugin): qinling_config.service_option, group='service_available' ) - conf.register_group(qinling_config.qingling_group) + conf.register_group(qinling_config.qinling_group) conf.register_opts(qinling_config.QinlingGroup, group='qinling') def get_opt_lists(self): return [ ('service_available', [qinling_config.service_option]), - (qinling_config.qingling_group.name, qinling_config.QinlingGroup) + (qinling_config.qinling_group.name, qinling_config.QinlingGroup) ] def get_service_clients(self): diff --git a/tools/cover.sh b/tools/cover.sh index 04ef2459..2a1ce1da 100755 --- a/tools/cover.sh +++ b/tools/cover.sh @@ -36,7 +36,7 @@ git checkout - [[ -n $uncommitted ]] && git stash pop > /dev/null # Generate and save coverage report -current_report=$(mktemp -t qingling_coverageXXXXXXX) +current_report=$(mktemp -t qinling_coverageXXXXXXX) find . -type f -name "*.py[c|o]" -delete && stestr run "$TESTR_ARGS" && coverage combine && coverage html -d cover coverage report --ignore-errors > $current_report current_missing=$(awk 'END { print $3 }' $current_report)