Remove all non-incubated oslo code
Rally repository includes openstack.common module with modules from oslo-incubator(modules are listed in openstack-common.conf file). All those modules can be splitted by 4 categories: 1. logging modules 2. aas related modules 3. cliutils 4. config Modules from first category were graduated to separate lib, so we can remove them and use `oslo.log`. Modules from second category are not really used and will be not used, because Rally-as-a-Service will use flask microframework instead of pecan(modules from oslo-incubator are designed for pecan). Since oslo core team did not plan to graduate `cliutils` module from oslo-incubator, so there are no reasons to sync this module with oslo, we can copy needed functions and maintain them in our repo. Additional to rally.openstack dir, modules from oslo incubator are located in tools dir. tools/config modules works pretty bad, opts from rally.osclients always lost during automated config generator. `oslo.config` lib provides a better way to autogenerate config sample of Rally. It requires new entry point, which returns a list with all opts(look at 'rally.common.opts', 'setup.cfg' for more details). Since all opts are used in one place, their names were unified. Also config was updated(via `tox -egenconfig`). tools/rally.bash_completion file is moved to etc dir, because etc dir corresponds better and it gave us ability to remove whole tools dir Closes-Bug: #1378960 Change-Id: Ic127269c367275d3adcfc9f40d9144fce8295391
This commit is contained in:
Andrey Kurilin
parent
5f8a424140
commit
d1f25b2e51
81
etc/rally.bash_completion
Normal file
81
etc/rally.bash_completion
Normal file
@ -0,0 +1,81 @@
|
||||
|
||||
#!/bin/bash
|
||||
|
||||
_rally()
|
||||
{
|
||||
declare -A SUBCOMMANDS
|
||||
declare -A OPTS
|
||||
|
||||
OPTS["deployment_check"]="--deployment"
|
||||
OPTS["deployment_config"]="--deployment"
|
||||
OPTS["deployment_create"]="--name --fromenv --filename --no-use"
|
||||
OPTS["deployment_destroy"]="--deployment"
|
||||
OPTS["deployment_list"]=""
|
||||
OPTS["deployment_recreate"]="--deployment"
|
||||
OPTS["deployment_show"]="--deployment"
|
||||
OPTS["deployment_use"]="--deployment"
|
||||
OPTS["info_BenchmarkScenarios"]=""
|
||||
OPTS["info_DeployEngines"]=""
|
||||
OPTS["info_DeploymentEngines"]=""
|
||||
OPTS["info_SLA"]=""
|
||||
OPTS["info_ServerProviders"]=""
|
||||
OPTS["info_find"]="--query"
|
||||
OPTS["info_list"]=""
|
||||
OPTS["show_flavors"]="--deployment"
|
||||
OPTS["show_images"]="--deployment"
|
||||
OPTS["show_keypairs"]="--deployment"
|
||||
OPTS["show_networks"]="--deployment"
|
||||
OPTS["show_secgroups"]="--deployment"
|
||||
OPTS["task_abort"]="--uuid"
|
||||
OPTS["task_delete"]="--force --uuid"
|
||||
OPTS["task_detailed"]="--uuid --iterations-data"
|
||||
OPTS["task_list"]="--deployment --all-deployments --status"
|
||||
OPTS["task_report"]="--tasks --out --open"
|
||||
OPTS["task_results"]="--uuid"
|
||||
OPTS["task_sla_check"]="--uuid --json"
|
||||
OPTS["task_start"]="--deployment --task --task-args --task-args-file --tag --no-use --abort-on-sla-failure"
|
||||
OPTS["task_status"]="--uuid"
|
||||
OPTS["task_use"]="--task"
|
||||
OPTS["task_validate"]="--deployment --task --task-args --task-args-file"
|
||||
OPTS["use_deployment"]="--deployment"
|
||||
OPTS["use_task"]="--uuid"
|
||||
OPTS["use_verification"]="--uuid"
|
||||
OPTS["verify_compare"]="--uuid-1 --uuid-2 --csv --html --json --output-file --threshold"
|
||||
OPTS["verify_detailed"]="--uuid --sort-by"
|
||||
OPTS["verify_list"]=""
|
||||
OPTS["verify_results"]="--uuid --html --json --output-file"
|
||||
OPTS["verify_show"]="--uuid --sort-by --detailed"
|
||||
OPTS["verify_start"]="--deployment --set --regex --tempest-config --no-use"
|
||||
OPTS["verify_use"]="--verification"
|
||||
|
||||
|
||||
for OPT in ${!OPTS[*]} ; do
|
||||
CMDSUB=(${OPT//_/ })
|
||||
SUBCOMMANDS[${CMDSUB[0]}]+="${CMDSUB[1]} "
|
||||
done
|
||||
|
||||
COMMANDS="${!SUBCOMMANDS[*]}"
|
||||
COMPREPLY=()
|
||||
|
||||
local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
|
||||
if [[ $cur =~ (\.|\~|\/).* ]] ; then
|
||||
_filedir
|
||||
elif [ $COMP_CWORD == "1" ] ; then
|
||||
COMPREPLY=($(compgen -W "$COMMANDS" -- ${cur}))
|
||||
elif [ $COMP_CWORD == "2" ] ; then
|
||||
COMPREPLY=($(compgen -W "${SUBCOMMANDS[${prev}]}" -- ${cur}))
|
||||
else
|
||||
if [ $prev == "--filename" ] ; then
|
||||
_filedir "@(json|ya?ml)"
|
||||
elif [ $prev == "--output-file" ] || [ $prev == "--out" ]; then
|
||||
_filedir
|
||||
else
|
||||
COMMAND="${COMP_WORDS[1]}_${COMP_WORDS[2]}"
|
||||
COMPREPLY=($(compgen -W "${OPTS[$COMMAND]}" -- ${cur}))
|
||||
fi
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
complete -F _rally rally
|
||||
@ -1,542 +1,477 @@
|
||||
[DEFAULT]
|
||||
|
||||
#
|
||||
# Options defined in rally.exceptions
|
||||
# From oslo.log
|
||||
#
|
||||
|
||||
# make exception message format errors fatal (boolean value)
|
||||
#fatal_exception_format_errors=false
|
||||
# Print debugging output (set logging level to DEBUG instead of
|
||||
# default WARNING level). (boolean value)
|
||||
#debug = false
|
||||
|
||||
# Print more verbose output (set logging level to INFO instead of
|
||||
# default WARNING level). (boolean value)
|
||||
#verbose = false
|
||||
|
||||
#
|
||||
# Options defined in rally.log
|
||||
#
|
||||
|
||||
# Print debugging output only for Rally. Off-site components
|
||||
# stay quiet. (boolean value)
|
||||
#rally_debug=false
|
||||
|
||||
|
||||
#
|
||||
# Options defined in rally.openstack.common.eventlet_backdoor
|
||||
#
|
||||
|
||||
# Enable eventlet backdoor. Acceptable values are 0, <port>,
|
||||
# and <start>:<end>, where 0 results in listening on a random
|
||||
# tcp port number; <port> results in listening on the
|
||||
# specified port number (and not enabling backdoor if that
|
||||
# port is in use); and <start>:<end> results in listening on
|
||||
# the smallest unused port number within the specified range
|
||||
# of port numbers. The chosen port is displayed in the
|
||||
# service's log file. (string value)
|
||||
#backdoor_port=<None>
|
||||
|
||||
|
||||
#
|
||||
# Options defined in rally.openstack.common.lockutils
|
||||
#
|
||||
|
||||
# Whether to disable inter-process locks (boolean value)
|
||||
#disable_process_locking=false
|
||||
|
||||
# Directory to use for lock files. (string value)
|
||||
#lock_path=<None>
|
||||
|
||||
|
||||
#
|
||||
# Options defined in rally.openstack.common.log
|
||||
#
|
||||
|
||||
# Print debugging output (set logging level to DEBUG instead
|
||||
# of default WARNING level). (boolean value)
|
||||
#debug=false
|
||||
|
||||
# Print more verbose output (set logging level to INFO instead
|
||||
# of default WARNING level). (boolean value)
|
||||
#verbose=false
|
||||
|
||||
# Log output to standard error. (boolean value)
|
||||
#use_stderr=true
|
||||
|
||||
# Format string to use for log messages with context. (string
|
||||
# value)
|
||||
#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
|
||||
|
||||
# Format string to use for log messages without context.
|
||||
# The name of a logging configuration file. This file is appended to
|
||||
# any existing logging configuration files. For details about logging
|
||||
# configuration files, see the Python logging module documentation.
|
||||
# (string value)
|
||||
#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
|
||||
|
||||
# Data to append to log format when level is DEBUG. (string
|
||||
# value)
|
||||
#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d
|
||||
|
||||
# Prefix each line of exception output with this format.
|
||||
# (string value)
|
||||
#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
|
||||
|
||||
# List of logger=LEVEL pairs. (list value)
|
||||
#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN
|
||||
|
||||
# Enables or disables publication of error events. (boolean
|
||||
# value)
|
||||
#publish_errors=false
|
||||
|
||||
# Enables or disables fatal status of deprecations. (boolean
|
||||
# value)
|
||||
#fatal_deprecations=false
|
||||
|
||||
# The format for an instance that is passed with the log
|
||||
# message. (string value)
|
||||
#instance_format="[instance: %(uuid)s] "
|
||||
|
||||
# The format for an instance UUID that is passed with the log
|
||||
# message. (string value)
|
||||
#instance_uuid_format="[instance: %(uuid)s] "
|
||||
|
||||
# The name of a logging configuration file. This file is
|
||||
# appended to any existing logging configuration files. For
|
||||
# details about logging configuration files, see the Python
|
||||
# logging module documentation. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/log_config
|
||||
#log_config_append=<None>
|
||||
#log_config_append = <None>
|
||||
|
||||
# DEPRECATED. A logging.Formatter log message format string
|
||||
# which may use any of the available logging.LogRecord
|
||||
# attributes. This option is deprecated. Please use
|
||||
# logging_context_format_string and
|
||||
# DEPRECATED. A logging.Formatter log message format string which may
|
||||
# use any of the available logging.LogRecord attributes. This option
|
||||
# is deprecated. Please use logging_context_format_string and
|
||||
# logging_default_format_string instead. (string value)
|
||||
#log_format=<None>
|
||||
#log_format = <None>
|
||||
|
||||
# Format string for %%(asctime)s in log records. Default:
|
||||
# %(default)s . (string value)
|
||||
#log_date_format=%Y-%m-%d %H:%M:%S
|
||||
# Format string for %%(asctime)s in log records. Default: %(default)s
|
||||
# . (string value)
|
||||
#log_date_format = %Y-%m-%d %H:%M:%S
|
||||
|
||||
# (Optional) Name of log file to output to. If no default is
|
||||
# set, logging will go to stdout. (string value)
|
||||
# (Optional) Name of log file to output to. If no default is set,
|
||||
# logging will go to stdout. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/logfile
|
||||
#log_file=<None>
|
||||
#log_file = <None>
|
||||
|
||||
# (Optional) The base directory used for relative --log-file
|
||||
# paths. (string value)
|
||||
# (Optional) The base directory used for relative --log-file paths.
|
||||
# (string value)
|
||||
# Deprecated group/name - [DEFAULT]/logdir
|
||||
#log_dir=<None>
|
||||
#log_dir = <None>
|
||||
|
||||
# Use syslog for logging. Existing syslog format is DEPRECATED
|
||||
# during I, and will change in J to honor RFC5424. (boolean
|
||||
# value)
|
||||
#use_syslog=false
|
||||
# Use syslog for logging. Existing syslog format is DEPRECATED during
|
||||
# I, and will change in J to honor RFC5424. (boolean value)
|
||||
#use_syslog = false
|
||||
|
||||
# (Optional) Enables or disables syslog rfc5424 format for
|
||||
# logging. If enabled, prefixes the MSG part of the syslog
|
||||
# message with APP-NAME (RFC5424). The format without the APP-
|
||||
# NAME is deprecated in I, and will be removed in J. (boolean
|
||||
# value)
|
||||
#use_syslog_rfc_format=false
|
||||
# (Optional) Enables or disables syslog rfc5424 format for logging. If
|
||||
# enabled, prefixes the MSG part of the syslog message with APP-NAME
|
||||
# (RFC5424). The format without the APP-NAME is deprecated in I, and
|
||||
# will be removed in J. (boolean value)
|
||||
#use_syslog_rfc_format = false
|
||||
|
||||
# Syslog facility to receive log lines. (string value)
|
||||
#syslog_log_facility=LOG_USER
|
||||
#syslog_log_facility = LOG_USER
|
||||
|
||||
# Log output to standard error. (boolean value)
|
||||
#use_stderr = true
|
||||
|
||||
# Format string to use for log messages with context. (string value)
|
||||
#logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s
|
||||
|
||||
# Format string to use for log messages without context. (string
|
||||
# value)
|
||||
#logging_default_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s
|
||||
|
||||
# Data to append to log format when level is DEBUG. (string value)
|
||||
#logging_debug_format_suffix = %(funcName)s %(pathname)s:%(lineno)d
|
||||
|
||||
# Prefix each line of exception output with this format. (string
|
||||
# value)
|
||||
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
|
||||
|
||||
# List of logger=LEVEL pairs. (list value)
|
||||
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN
|
||||
|
||||
# Enables or disables publication of error events. (boolean value)
|
||||
#publish_errors = false
|
||||
|
||||
# Enables or disables fatal status of deprecations. (boolean value)
|
||||
#fatal_deprecations = false
|
||||
|
||||
# The format for an instance that is passed with the log message.
|
||||
# (string value)
|
||||
#instance_format = "[instance: %(uuid)s] "
|
||||
|
||||
# The format for an instance UUID that is passed with the log message.
|
||||
# (string value)
|
||||
#instance_uuid_format = "[instance: %(uuid)s] "
|
||||
|
||||
#
|
||||
# Options defined in rally.openstack.common.periodic_task
|
||||
# From rally
|
||||
#
|
||||
|
||||
# Some periodic tasks can be run in a separate process. Should
|
||||
# we run them here? (boolean value)
|
||||
#run_external_periodic_tasks=true
|
||||
# Print debugging output only for Rally. Off-site components stay
|
||||
# quiet. (boolean value)
|
||||
#rally_debug = false
|
||||
|
||||
#
|
||||
# Options defined in rally.osclients
|
||||
#
|
||||
# make exception message format errors fatal (boolean value)
|
||||
#fatal_exception_format_errors = false
|
||||
|
||||
# HTTP timeout for any of OpenStack service in seconds
|
||||
#openstack_client_http_timeout=180.0
|
||||
# HTTP timeout for any of OpenStack service in seconds (floating point
|
||||
# value)
|
||||
#openstack_client_http_timeout = 180.0
|
||||
|
||||
# Use SSL for all OpenStack API interfaces
|
||||
#https_insecure=False
|
||||
# Use SSL for all OpenStack API interfaces (boolean value)
|
||||
#https_insecure = false
|
||||
|
||||
# Path to CA server cetrificate for SSL (string value)
|
||||
#https_cacert = <None>
|
||||
|
||||
# Path to CA server cetrificate for SSL
|
||||
#https_cacert=<None>
|
||||
|
||||
[benchmark]
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.scenarios.cinder.utils
|
||||
# From rally
|
||||
#
|
||||
|
||||
# Time to sleep after creating a resource before polling for
|
||||
# it status (floating point value)
|
||||
#cinder_volume_create_prepoll_delay=2.0
|
||||
# Time to sleep after creating a resource before polling for it status
|
||||
# (floating point value)
|
||||
#cinder_volume_create_prepoll_delay = 2.0
|
||||
|
||||
# Time to wait for cinder volume to be created. (floating
|
||||
# Time to wait for cinder volume to be created. (floating point value)
|
||||
#cinder_volume_create_timeout = 600.0
|
||||
|
||||
# Interval between checks when waiting for volume creation. (floating
|
||||
# point value)
|
||||
#cinder_volume_create_timeout=600.0
|
||||
#cinder_volume_create_poll_interval = 2.0
|
||||
|
||||
# Interval between checks when waiting for volume creation.
|
||||
# (floating point value)
|
||||
#cinder_volume_create_poll_interval=2.0
|
||||
# Time to wait for cinder volume to be deleted. (floating point value)
|
||||
#cinder_volume_delete_timeout = 600.0
|
||||
|
||||
# Time to wait for cinder volume to be deleted. (floating
|
||||
# Interval between checks when waiting for volume deletion. (floating
|
||||
# point value)
|
||||
#cinder_volume_delete_timeout=600.0
|
||||
#cinder_volume_delete_poll_interval = 2.0
|
||||
|
||||
# Interval between checks when waiting for volume deletion.
|
||||
# Time to sleep after creating a resource before polling for it status
|
||||
# (floating point value)
|
||||
#cinder_volume_delete_poll_interval=2.0
|
||||
#glance_image_create_prepoll_delay = 2.0
|
||||
|
||||
# Time to wait for glance image to be created. (floating point value)
|
||||
#glance_image_create_timeout = 120.0
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.scenarios.glance.utils
|
||||
#
|
||||
# Interval between checks when waiting for image creation. (floating
|
||||
# point value)
|
||||
#glance_image_create_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after creating a resource before polling for
|
||||
# it status (floating point value)
|
||||
#glance_image_create_prepoll_delay=2.0
|
||||
# Time to wait for glance image to be deleted. (floating point value)
|
||||
#glance_image_delete_timeout = 120.0
|
||||
|
||||
# Time to wait for glance image to be created. (floating point
|
||||
# Interval between checks when waiting for image deletion. (floating
|
||||
# point value)
|
||||
#glance_image_delete_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after creating a resource before polling for it status
|
||||
# (floating point value)
|
||||
#heat_stack_create_prepoll_delay = 2.0
|
||||
|
||||
# Time to wait for heat stack to be created. (floating point value)
|
||||
#heat_stack_create_timeout = 3600.0
|
||||
|
||||
# Interval between checks when waiting for stack creation. (floating
|
||||
# point value)
|
||||
#heat_stack_create_poll_interval = 1.0
|
||||
|
||||
# Time to wait for heat stack to be deleted. (floating point value)
|
||||
#heat_stack_delete_timeout = 3600.0
|
||||
|
||||
# Interval between checks when waiting for stack deletion. (floating
|
||||
# point value)
|
||||
#heat_stack_delete_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after updating a resource before polling for it status
|
||||
# (floating point value)
|
||||
#heat_stack_update_prepoll_delay = 2.0
|
||||
|
||||
# Time to wait for stack to be updated (floating point value)
|
||||
#heat_stack_update_timeout = 3600.0
|
||||
|
||||
# Interval between checks when waiting for stack update. (floating
|
||||
# point value)
|
||||
#heat_stack_update_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after start before polling for status (floating point
|
||||
# value)
|
||||
#glance_image_create_timeout=120.0
|
||||
|
||||
# Interval between checks when waiting for image creation.
|
||||
# (floating point value)
|
||||
#glance_image_create_poll_interval=1.0
|
||||
|
||||
# Time to wait for glance image to be deleted. (floating point
|
||||
# value)
|
||||
#glance_image_delete_timeout=120.0
|
||||
|
||||
# Interval between checks when waiting for image deletion.
|
||||
# (floating point value)
|
||||
#glance_image_delete_poll_interval=1.0
|
||||
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.scenarios.heat.utils
|
||||
#
|
||||
|
||||
# Time to sleep after creating a resource before polling for
|
||||
# it status (floating point value)
|
||||
#heat_stack_create_prepoll_delay=2.0
|
||||
|
||||
# Time to wait for heat stack to be created. (floating point
|
||||
# value)
|
||||
#heat_stack_create_timeout=3600.0
|
||||
|
||||
# Interval between checks when waiting for stack creation.
|
||||
# (floating point value)
|
||||
#heat_stack_create_poll_interval=1.0
|
||||
|
||||
# Time to wait for heat stack to be deleted. (floating point
|
||||
# value)
|
||||
#heat_stack_delete_timeout=3600.0
|
||||
|
||||
# Interval between checks when waiting for stack deletion.
|
||||
# (floating point value)
|
||||
#heat_stack_delete_poll_interval=1.0
|
||||
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.scenarios.nova.utils
|
||||
#
|
||||
|
||||
# Time to sleep after start before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_start_prepoll_delay=0.0
|
||||
#nova_server_start_prepoll_delay = 0.0
|
||||
|
||||
# Server start timeout (floating point value)
|
||||
#nova_server_start_timeout=300.0
|
||||
#nova_server_start_timeout = 300.0
|
||||
|
||||
# Server start poll interval (floating point value)
|
||||
#nova_server_start_poll_interval=1.0
|
||||
#nova_server_start_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after stop before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_stop_prepoll_delay=0.0
|
||||
# Time to sleep after stop before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_stop_prepoll_delay = 0.0
|
||||
|
||||
# Server stop timeout (floating point value)
|
||||
#nova_server_stop_timeout=300.0
|
||||
#nova_server_stop_timeout = 300.0
|
||||
|
||||
# Server stop poll interval (floating point value)
|
||||
#nova_server_stop_poll_interval=2.0
|
||||
#nova_server_stop_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after boot before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_boot_prepoll_delay=1.0
|
||||
# Time to sleep after boot before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_boot_prepoll_delay = 1.0
|
||||
|
||||
# Server boot timeout (floating point value)
|
||||
#nova_server_boot_timeout=300.0
|
||||
#nova_server_boot_timeout = 300.0
|
||||
|
||||
# Server boot poll interval (floating point value)
|
||||
#nova_server_boot_poll_interval=1.0
|
||||
#nova_server_boot_poll_interval = 1.0
|
||||
|
||||
# Time to sleep after delete before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_delete_prepoll_delay=2.0
|
||||
# Time to sleep after delete before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_delete_prepoll_delay = 2.0
|
||||
|
||||
# Server delete timeout (floating point value)
|
||||
#nova_server_delete_timeout=300.0
|
||||
#nova_server_delete_timeout = 300.0
|
||||
|
||||
# Server delete poll interval (floating point value)
|
||||
#nova_server_delete_poll_interval=2.0
|
||||
#nova_server_delete_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after reboot before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_reboot_prepoll_delay=2.0
|
||||
# Time to sleep after reboot before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_reboot_prepoll_delay = 2.0
|
||||
|
||||
# Server reboot timeout (floating point value)
|
||||
#nova_server_reboot_timeout=300.0
|
||||
#nova_server_reboot_timeout = 300.0
|
||||
|
||||
# Server reboot poll interval (floating point value)
|
||||
#nova_server_reboot_poll_interval=2.0
|
||||
#nova_server_reboot_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after rescue before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_rescue_prepoll_delay=2.0
|
||||
# Time to sleep after rescue before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_rescue_prepoll_delay = 2.0
|
||||
|
||||
# Server rescue timeout (floating point value)
|
||||
#nova_server_rescue_timeout=300.0
|
||||
#nova_server_rescue_timeout = 300.0
|
||||
|
||||
# Server rescue poll interval (floating point value)
|
||||
#nova_server_rescue_poll_interval=2.0
|
||||
#nova_server_rescue_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after unrescue before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_unrescue_prepoll_delay=2.0
|
||||
# Time to sleep after unrescue before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_unrescue_prepoll_delay = 2.0
|
||||
|
||||
# Server unrescue timeout (floating point value)
|
||||
#nova_server_unrescue_timeout=300.0
|
||||
#nova_server_unrescue_timeout = 300.0
|
||||
|
||||
# Server unrescue poll interval (floating point value)
|
||||
#nova_server_unrescue_poll_interval=2.0
|
||||
#nova_server_unrescue_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after suspend before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_suspend_prepoll_delay=2.0
|
||||
# Time to sleep after suspend before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_suspend_prepoll_delay = 2.0
|
||||
|
||||
# Server suspend timeout (floating point value)
|
||||
#nova_server_suspend_timeout=300.0
|
||||
#nova_server_suspend_timeout = 300.0
|
||||
|
||||
# Server suspend poll interval (floating point value)
|
||||
#nova_server_suspend_poll_interval=2.0
|
||||
#nova_server_suspend_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after image_create before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_image_create_prepoll_delay=0.0
|
||||
# Time to sleep after image_create before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_image_create_prepoll_delay = 0.0
|
||||
|
||||
# Server image_create timeout (floating point value)
|
||||
#nova_server_image_create_timeout=300.0
|
||||
#nova_server_image_create_timeout = 300.0
|
||||
|
||||
# Server image_create poll interval (floating point value)
|
||||
#nova_server_image_create_poll_interval=2.0
|
||||
#nova_server_image_create_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after image_delete before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_image_delete_prepoll_delay=0.0
|
||||
# Time to sleep after image_delete before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_image_delete_prepoll_delay = 0.0
|
||||
|
||||
# Server image_delete timeout (floating point value)
|
||||
#nova_server_image_delete_timeout=300.0
|
||||
#nova_server_image_delete_timeout = 300.0
|
||||
|
||||
# Server image_delete poll interval (floating point value)
|
||||
#nova_server_image_delete_poll_interval=2.0
|
||||
#nova_server_image_delete_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after resize before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_resize_prepoll_delay=2.0
|
||||
# Time to sleep after resize before polling for status (floating point
|
||||
# value)
|
||||
#nova_server_resize_prepoll_delay = 2.0
|
||||
|
||||
# Server resize timeout (floating point value)
|
||||
#nova_server_resize_timeout=400.0
|
||||
#nova_server_resize_timeout = 400.0
|
||||
|
||||
# Server resize poll interval (floating point value)
|
||||
#nova_server_resize_poll_interval=5.0
|
||||
#nova_server_resize_poll_interval = 5.0
|
||||
|
||||
# Time to sleep after resize_confirm before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_resize_confirm_prepoll_delay=0.0
|
||||
#nova_server_resize_confirm_prepoll_delay = 0.0
|
||||
|
||||
# Server resize_confirm timeout (floating point value)
|
||||
#nova_server_resize_confirm_timeout=200.0
|
||||
#nova_server_resize_confirm_timeout = 200.0
|
||||
|
||||
# Server resize_confirm poll interval (floating point value)
|
||||
#nova_server_resize_confirm_poll_interval=2.0
|
||||
#nova_server_resize_confirm_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after resize_revert before polling for status
|
||||
# (floating point value)
|
||||
#nova_server_resize_revert_prepoll_delay=0.0
|
||||
#nova_server_resize_revert_prepoll_delay = 0.0
|
||||
|
||||
# Server resize_revert timeout (floating point value)
|
||||
#nova_server_resize_revert_timeout=200.0
|
||||
#nova_server_resize_revert_timeout = 200.0
|
||||
|
||||
# Server resize_revert poll interval (floating point value)
|
||||
#nova_server_resize_revert_poll_interval=2.0
|
||||
#nova_server_resize_revert_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after live_migrate before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_live_migrate_prepoll_delay = 1.0
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.scenarios.sahara.utils
|
||||
#
|
||||
# Server live_migrate timeout (floating point value)
|
||||
#nova_server_live_migrate_timeout = 400.0
|
||||
|
||||
# A timeout in seconds for a cluster create operation (integer
|
||||
# value)
|
||||
#cluster_create_timeout=600
|
||||
# Server live_migrate poll interval (floating point value)
|
||||
#nova_server_live_migrate_poll_interval = 2.0
|
||||
|
||||
# Time to sleep after migrate before polling for status (floating
|
||||
# point value)
|
||||
#nova_server_migrate_prepoll_delay = 1.0
|
||||
|
||||
# Server migrate timeout (floating point value)
|
||||
#nova_server_migrate_timeout = 400.0
|
||||
|
||||
# Server migrate poll interval (floating point value)
|
||||
#nova_server_migrate_poll_interval = 2.0
|
||||
|
||||
# A timeout in seconds for a cluster create operation (integer value)
|
||||
#cluster_create_timeout = 600
|
||||
|
||||
# Cluster status polling interval in seconds (integer value)
|
||||
#cluster_check_interval=5
|
||||
#cluster_check_interval = 5
|
||||
|
||||
# A timeout in seconds for a cluster create operation (integer
|
||||
# value)
|
||||
#job_execution_timeout=600
|
||||
# A timeout in seconds for a cluster create operation (integer value)
|
||||
#job_execution_timeout = 600
|
||||
|
||||
# Cluster status polling interval in seconds (integer value)
|
||||
#job_check_interval=5
|
||||
#job_check_interval = 5
|
||||
|
||||
|
||||
[database]
|
||||
|
||||
#
|
||||
# Options defined in oslo.db
|
||||
# From oslo.db
|
||||
#
|
||||
|
||||
# The file name to use with SQLite. (string value)
|
||||
#sqlite_db=oslo.sqlite
|
||||
# Deprecated group/name - [DEFAULT]/sqlite_db
|
||||
#sqlite_db = oslo.sqlite
|
||||
|
||||
# If True, SQLite uses synchronous mode. (boolean value)
|
||||
#sqlite_synchronous=true
|
||||
# Deprecated group/name - [DEFAULT]/sqlite_synchronous
|
||||
#sqlite_synchronous = true
|
||||
|
||||
# The back end to use for the database. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/db_backend
|
||||
#backend=sqlalchemy
|
||||
#backend = sqlalchemy
|
||||
|
||||
# The SQLAlchemy connection string to use to connect to the
|
||||
# database. (string value)
|
||||
# The SQLAlchemy connection string to use to connect to the database.
|
||||
# (string value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection
|
||||
# Deprecated group/name - [DATABASE]/sql_connection
|
||||
# Deprecated group/name - [sql]/connection
|
||||
#connection=<None>
|
||||
#connection = <None>
|
||||
|
||||
# The SQLAlchemy connection string to use to connect to the
|
||||
# slave database. (string value)
|
||||
#slave_connection=<None>
|
||||
# The SQLAlchemy connection string to use to connect to the slave
|
||||
# database. (string value)
|
||||
#slave_connection = <None>
|
||||
|
||||
# The SQL mode to be used for MySQL sessions. This option,
|
||||
# including the default, overrides any server-set SQL mode. To
|
||||
# use whatever SQL mode is set by the server configuration,
|
||||
# set this to no value. Example: mysql_sql_mode= (string
|
||||
# value)
|
||||
#mysql_sql_mode=TRADITIONAL
|
||||
# The SQL mode to be used for MySQL sessions. This option, including
|
||||
# the default, overrides any server-set SQL mode. To use whatever SQL
|
||||
# mode is set by the server configuration, set this to no value.
|
||||
# Example: mysql_sql_mode= (string value)
|
||||
#mysql_sql_mode = TRADITIONAL
|
||||
|
||||
# Timeout before idle SQL connections are reaped. (integer
|
||||
# value)
|
||||
# Timeout before idle SQL connections are reaped. (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
|
||||
# Deprecated group/name - [DATABASE]/sql_idle_timeout
|
||||
# Deprecated group/name - [sql]/idle_timeout
|
||||
#idle_timeout=3600
|
||||
#idle_timeout = 3600
|
||||
|
||||
# Minimum number of SQL connections to keep open in a pool.
|
||||
# (integer value)
|
||||
# Minimum number of SQL connections to keep open in a pool. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_min_pool_size
|
||||
# Deprecated group/name - [DATABASE]/sql_min_pool_size
|
||||
#min_pool_size=1
|
||||
#min_pool_size = 1
|
||||
|
||||
# Maximum number of SQL connections to keep open in a pool.
|
||||
# (integer value)
|
||||
# Maximum number of SQL connections to keep open in a pool. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_pool_size
|
||||
# Deprecated group/name - [DATABASE]/sql_max_pool_size
|
||||
#max_pool_size=<None>
|
||||
#max_pool_size = <None>
|
||||
|
||||
# Maximum db connection retries during startup. Set to -1 to
|
||||
# specify an infinite retry count. (integer value)
|
||||
# Maximum number of database connection retries during startup. Set to
|
||||
# -1 to specify an infinite retry count. (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_retries
|
||||
# Deprecated group/name - [DATABASE]/sql_max_retries
|
||||
#max_retries=10
|
||||
#max_retries = 10
|
||||
|
||||
# Interval between retries of opening a SQL connection.
|
||||
# (integer value)
|
||||
# Interval between retries of opening a SQL connection. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_retry_interval
|
||||
# Deprecated group/name - [DATABASE]/reconnect_interval
|
||||
#retry_interval=10
|
||||
#retry_interval = 10
|
||||
|
||||
# If set, use this value for max_overflow with SQLAlchemy.
|
||||
# (integer value)
|
||||
# If set, use this value for max_overflow with SQLAlchemy. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_max_overflow
|
||||
# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow
|
||||
#max_overflow=<None>
|
||||
#max_overflow = <None>
|
||||
|
||||
# Verbosity of SQL debugging information: 0=None,
|
||||
# 100=Everything. (integer value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_debug
|
||||
#connection_debug=0
|
||||
|
||||
# Add Python stack traces to SQL as comment strings. (boolean
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_trace
|
||||
#connection_trace=false
|
||||
|
||||
# If set, use this value for pool_timeout with SQLAlchemy.
|
||||
# Verbosity of SQL debugging information: 0=None, 100=Everything.
|
||||
# (integer value)
|
||||
# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
|
||||
#pool_timeout=<None>
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_debug
|
||||
#connection_debug = 0
|
||||
|
||||
# Enable the experimental use of database reconnect on
|
||||
# connection lost. (boolean value)
|
||||
#use_db_reconnect=false
|
||||
# Add Python stack traces to SQL as comment strings. (boolean value)
|
||||
# Deprecated group/name - [DEFAULT]/sql_connection_trace
|
||||
#connection_trace = false
|
||||
|
||||
# If set, use this value for pool_timeout with SQLAlchemy. (integer
|
||||
# value)
|
||||
# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout
|
||||
#pool_timeout = <None>
|
||||
|
||||
# Enable the experimental use of database reconnect on connection
|
||||
# lost. (boolean value)
|
||||
#use_db_reconnect = false
|
||||
|
||||
# Seconds between database connection retries. (integer value)
|
||||
#db_retry_interval=1
|
||||
#db_retry_interval = 1
|
||||
|
||||
# If True, increases the interval between database connection
|
||||
# retries up to db_max_retry_interval. (boolean value)
|
||||
#db_inc_retry_interval=true
|
||||
# If True, increases the interval between database connection retries
|
||||
# up to db_max_retry_interval. (boolean value)
|
||||
#db_inc_retry_interval = true
|
||||
|
||||
# If db_inc_retry_interval is set, the maximum seconds between
|
||||
# database connection retries. (integer value)
|
||||
#db_max_retry_interval=10
|
||||
#db_max_retry_interval = 10
|
||||
|
||||
# Maximum database connection retries before error is raised.
|
||||
# Set to -1 to specify an infinite retry count. (integer
|
||||
# value)
|
||||
#db_max_retries=20
|
||||
# Maximum database connection retries before error is raised. Set to
|
||||
# -1 to specify an infinite retry count. (integer value)
|
||||
#db_max_retries = 20
|
||||
|
||||
|
||||
[image]
|
||||
|
||||
#
|
||||
# Options defined in rally.verification.verifiers.tempest.config
|
||||
# From rally
|
||||
#
|
||||
|
||||
# Version of cirros image (string value)
|
||||
#cirros_version=0.3.2
|
||||
#cirros_version = 0.3.2
|
||||
|
||||
# Cirros image name (string value)
|
||||
#cirros_image=cirros-0.3.2-x86_64-disk.img
|
||||
|
||||
|
||||
[rest]
|
||||
|
||||
#
|
||||
# Options defined in rally.aas.rest
|
||||
#
|
||||
|
||||
# The port for the Rally API server (integer value)
|
||||
#port=8877
|
||||
|
||||
# The listen IP for the Rally API server (string value)
|
||||
#host=0.0.0.0
|
||||
#cirros_image = cirros-0.3.2-x86_64-disk.img
|
||||
|
||||
|
||||
[users_context]
|
||||
|
||||
#
|
||||
# Options defined in rally.benchmark.context.users
|
||||
# From rally
|
||||
#
|
||||
|
||||
# How many concurrent threads use for serving users context
|
||||
# (integer value)
|
||||
#resource_management_workers=30
|
||||
|
||||
# ID of domain in which projects will be created. (string
|
||||
# How many concurrent threads use for serving users context (integer
|
||||
# value)
|
||||
#project_domain=default
|
||||
#resource_management_workers = 30
|
||||
|
||||
# ID of domain in which projects will be created. (string value)
|
||||
#project_domain = default
|
||||
|
||||
# ID of domain in which users will be created. (string value)
|
||||
#user_domain=default
|
||||
|
||||
|
||||
#user_domain = default
|
||||
|
||||
@ -8,14 +8,14 @@ iso8601>=0.1.9
|
||||
Jinja2>=2.6 # BSD License (3 clause)
|
||||
jsonschema>=2.0.0,<3.0.0
|
||||
netaddr>=0.7.12
|
||||
oslo.config>=1.6.0 # Apache-2.0
|
||||
oslo.db>=1.4.1 # Apache-2.0
|
||||
oslo.i18n>=1.3.0 # Apache-2.0
|
||||
oslo.config>=1.6.0 # Apache-2.0
|
||||
oslo.db>=1.4.1 # Apache-2.0
|
||||
oslo.i18n>=1.3.0 # Apache-2.0
|
||||
oslo.log>=0.1.0 # Apache-2.0
|
||||
oslo.serialization>=1.2.0 # Apache-2.0
|
||||
oslo.utils>=1.2.0 # Apache-2.0
|
||||
paramiko>=1.13.0
|
||||
pbr>=0.6,!=0.7,<1.0
|
||||
pecan>=0.8.0
|
||||
PrettyTable>=0.7,<0.8
|
||||
PyYAML>=3.1.0
|
||||
psycopg2
|
||||
@ -36,4 +36,3 @@ requests>=2.2.0,!=2.4.0
|
||||
SQLAlchemy>=0.9.7,<=0.9.99
|
||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
||||
six>=1.9.0
|
||||
WSME>=0.6
|
||||
|
||||
@ -24,13 +24,14 @@ packages =
|
||||
|
||||
data_files =
|
||||
/etc/bash_completion.d =
|
||||
tools/rally.bash_completion
|
||||
etc/rally.bash_completion
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
rally = rally.cmd.main:main
|
||||
rally-api = rally.cmd.api:main
|
||||
rally-manage = rally.cmd.manage:main
|
||||
oslo.config.opts =
|
||||
rally = rally.common.opts:list_opts
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
|
||||
@ -12,7 +12,7 @@ Rally Specific Commandments
|
||||
* [N302] - Ensure that nonexistent "assert_called" is not used
|
||||
* [N303] - Ensure that nonexistent "assert_called_once" is not used
|
||||
* [N310-N314] - Reserved for rules related to logging
|
||||
* [N310] - Ensure that ``rally.common.log`` is used instead of ``rally.openstack.common.log``
|
||||
* [N310] - Ensure that ``rally.common.log`` is used as logging module
|
||||
* [N311] - Validate that debug level logs are not translated
|
||||
* [N312] - Validate correctness of debug on check.
|
||||
* [N32x] - Reserved for rules related to assert* methods
|
||||
|
||||
@ -120,8 +120,8 @@ def check_import_of_logging(logical_line, filename):
|
||||
|
||||
excluded_files = ["./rally/common/log.py", "./tests/unit/test_log.py"]
|
||||
|
||||
forbidden_imports = ["from rally.openstack.common import log",
|
||||
"import rally.openstack.common.log",
|
||||
forbidden_imports = ["from oslo_log",
|
||||
"import oslo_log",
|
||||
"import logging"]
|
||||
|
||||
if filename not in excluded_files:
|
||||
|
||||
@ -62,8 +62,8 @@ class HackingTestCase(test.TestCase):
|
||||
self.assertTrue(actual_msg.startswith("N303"))
|
||||
|
||||
def test_check_wrong_logging_import(self):
|
||||
bad_imports = ["from rally.openstack.common import log",
|
||||
"import rally.openstack.common.log",
|
||||
bad_imports = ["from oslo_log import log",
|
||||
"import oslo_log",
|
||||
"import logging"]
|
||||
good_imports = ["from rally.common import log",
|
||||
"from rally.common.log",
|
||||
|
||||
9
tox.ini
9
tox.ini
@ -34,6 +34,13 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
||||
changedir = doc/source
|
||||
commands = make html
|
||||
|
||||
[testenv:genconfig]
|
||||
commands =
|
||||
oslo-config-generator --output-file etc/rally/rally.conf.sample \
|
||||
--namespace rally \
|
||||
--namespace oslo.db \
|
||||
--namespace oslo.log
|
||||
|
||||
[tox:jenkins]
|
||||
downloadcache = ~/cache/pip
|
||||
|
||||
@ -41,7 +48,7 @@ downloadcache = ~/cache/pip
|
||||
ignore = E126,H703
|
||||
show-source = true
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,*rally/openstack*,setup.py
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,setup.py
|
||||
|
||||
[hacking]
|
||||
import_exceptions = rally.common.i18n
|
||||
|
||||
Loading…
Reference in New Issue
Block a user